Skip to content

Commit a6ee73b

Browse files
committed
atop: fix cross-compilation
atop 2.10 broke cross-compilation by hard-coding a build architecture pkg-config. atop 2.11 fixed the issue by reading the PKG_CONFIG environment variable, but cross-compilation remained broken in nixpkgs because PKG_CONFIG was not set. Moving pkg-config to nativeBuildInputs fixes the variable and the build.
1 parent 7fd4e5f commit a6ee73b

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

pkgs/by-name/at/atop/package.nix

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,16 @@ stdenv.mkDerivation rec {
2222
hash = "sha256-m5TGZmAu//e/QC7M5wbDR/OMOctjSY+dOWJoYeVkbiA=";
2323
};
2424

25-
nativeBuildInputs = lib.optionals withAtopgpu [
25+
nativeBuildInputs = [
26+
pkg-config
27+
] ++ lib.optionals withAtopgpu [
2628
python3.pkgs.wrapPython
2729
];
2830

2931
buildInputs = [
3032
glib
3133
zlib
3234
ncurses
33-
pkg-config
3435
] ++ lib.optionals withAtopgpu [
3536
python3
3637
];

0 commit comments

Comments
 (0)