diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-04-10 22:50:27 +0300 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2016-04-14 08:32:20 +0300 |
| commit | 794f07d4e42afe3f2410355bfb9cde3c498ab432 (patch) | |
| tree | 323adedb2276f7475bb80d108e4c0c4d0b3c8fa7 /pkgs/os-specific/linux | |
| parent | f34655e28cedb36acbf608bbeff96e5a91290b26 (diff) | |
| download | nixlib-794f07d4e42afe3f2410355bfb9cde3c498ab432.tar nixlib-794f07d4e42afe3f2410355bfb9cde3c498ab432.tar.gz nixlib-794f07d4e42afe3f2410355bfb9cde3c498ab432.tar.bz2 nixlib-794f07d4e42afe3f2410355bfb9cde3c498ab432.tar.lz nixlib-794f07d4e42afe3f2410355bfb9cde3c498ab432.tar.xz nixlib-794f07d4e42afe3f2410355bfb9cde3c498ab432.tar.zst nixlib-794f07d4e42afe3f2410355bfb9cde3c498ab432.zip | |
treewide: Mass replace 'binutils}/bin' to refer to the correct outputs
Diffstat (limited to 'pkgs/os-specific/linux')
| -rw-r--r-- | pkgs/os-specific/linux/checksec/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/gradm/default.nix | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/checksec/default.nix b/pkgs/os-specific/linux/checksec/default.nix index 60468538be24..e698c11ad0fb 100644 --- a/pkgs/os-specific/linux/checksec/default.nix +++ b/pkgs/os-specific/linux/checksec/default.nix @@ -25,9 +25,9 @@ stdenv.mkDerivation rec { substituteInPlace $out/bin/checksec --replace find ${findutils}/bin/find substituteInPlace $out/bin/checksec --replace "file $" "${file}/bin/file $" substituteInPlace $out/bin/checksec --replace "xargs file" "xargs ${file}/bin/file" - substituteInPlace $out/bin/checksec --replace " readelf -" " ${binutils}/bin/readelf -" - substituteInPlace $out/bin/checksec --replace "(readelf -" "(${binutils}/bin/readelf -" - substituteInPlace $out/bin/checksec --replace "command_exists readelf" "command_exists ${binutils}/bin/readelf" + substituteInPlace $out/bin/checksec --replace " readelf -" " ${binutils.out}/bin/readelf -" + substituteInPlace $out/bin/checksec --replace "(readelf -" "(${binutils.out}/bin/readelf -" + substituteInPlace $out/bin/checksec --replace "command_exists readelf" "command_exists ${binutils.out}/bin/readelf" substituteInPlace $out/bin/checksec --replace "/sbin/sysctl -" "${procps}/sbin/sysctl -" substituteInPlace $out/bin/checksec --replace "/usr/bin/id -" "${coreutils}/bin/id -" ''; diff --git a/pkgs/os-specific/linux/gradm/default.nix b/pkgs/os-specific/linux/gradm/default.nix index 1500cf2f3949..121b6db54002 100644 --- a/pkgs/os-specific/linux/gradm/default.nix +++ b/pkgs/os-specific/linux/gradm/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { "FLEX=${flex}/bin/flex" "BISON=${bison}/bin/bison" "FIND=${findutils}/bin/find" - "STRIP=${binutils}/bin/strip" + "STRIP=${binutils.out}/bin/strip" "INSTALL=${coreutils}/bin/install" "MANDIR=/share/man" "MKNOD=true" |