Skip to content

Commit

Permalink
rpm-ostree: fix on aarch64-linux by using GCC 11 and passing -lgcc
Browse files Browse the repository at this point in the history
See NixOS#209113 for context. This has to
be done manually because rpm-ostree doesn't use the Cargo setup hooks (which
automatically set this flag).
  • Loading branch information
winterqt committed Feb 15, 2023
1 parent 2097723 commit d1d283e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 0 deletions.
3 changes: 3 additions & 0 deletions pkgs/tools/misc/rpm-ostree/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,9 @@ stdenv.mkDerivation rec {
env NOCONFIGURE=1 ./autogen.sh
'';

# https://github.com/NixOS/nixpkgs/issues/201254
NIX_LDFLAGS = lib.optionalString (stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU) "-lgcc";

meta = with lib; {
description = "A hybrid image/package system. It uses OSTree as an image format, and uses RPM as a component model";
homepage = "https://coreos.github.io/rpm-ostree/";
Expand Down
2 changes: 2 additions & 0 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -11106,6 +11106,8 @@ with pkgs;

rpm-ostree = callPackage ../tools/misc/rpm-ostree {
gperf = gperf_3_0;
# https://github.com/NixOS/nixpkgs/issues/201254
stdenv = if stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU then gcc11Stdenv else stdenv;
};

rpm2targz = callPackage ../tools/archivers/rpm2targz { };
Expand Down

0 comments on commit d1d283e

Please sign in to comment.