JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

treewide: Mass replace 'binutils}/bin' to refer to the correct outputs

Browse Source
This commit is contained in:
Tuomas Tynkkynen 2016-04-10 22:50:27 +03:00 committed by Tuomas Tynkkynen
parent f34655e28c
commit 794f07d4e4
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/compilers/rustc/generic.nix
View File

@ -123,7 +123,7 @@ with stdenv.lib; stdenv.mkDerivation {
configureFlags = configureFlags configureFlags = configureFlags
++ [ "--enable-local-rust" "--local-rust-root=$snapshot" "--enable-rpath" ] ++ [ "--enable-local-rust" "--local-rust-root=$snapshot" "--enable-rpath" ]
# ++ [ "--jemalloc-root=${jemalloc}/lib" # ++ [ "--jemalloc-root=${jemalloc}/lib"
++ [ "--default-linker=${stdenv.cc}/bin/cc" "--default-ar=${binutils}/bin/ar" ] ++ [ "--default-linker=${stdenv.cc}/bin/cc" "--default-ar=${binutils.out}/bin/ar" ]
++ optional (stdenv.cc.cc ? isClang) "--enable-clang" ++ optional (stdenv.cc.cc ? isClang) "--enable-clang"
++ optional (!forceBundledLLVM) "--llvm-root=${llvmShared}"; ++ optional (!forceBundledLLVM) "--llvm-root=${llvmShared}";

6
pkgs/os-specific/linux/checksec/default.nix
View File

@ -25,9 +25,9 @@ stdenv.mkDerivation rec {
substituteInPlace $out/bin/checksec --replace find ${findutils}/bin/find substituteInPlace $out/bin/checksec --replace find ${findutils}/bin/find
substituteInPlace $out/bin/checksec --replace "file $" "${file}/bin/file $" 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 "xargs file" "xargs ${file}/bin/file"
substituteInPlace $out/bin/checksec --replace " readelf -" " ${binutils}/bin/readelf -" substituteInPlace $out/bin/checksec --replace " readelf -" " ${binutils.out}/bin/readelf -"
substituteInPlace $out/bin/checksec --replace "(readelf -" "(${binutils}/bin/readelf -" substituteInPlace $out/bin/checksec --replace "(readelf -" "(${binutils.out}/bin/readelf -"
substituteInPlace $out/bin/checksec --replace "command_exists readelf" "command_exists ${binutils}/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 "/sbin/sysctl -" "${procps}/sbin/sysctl -"
substituteInPlace $out/bin/checksec --replace "/usr/bin/id -" "${coreutils}/bin/id -" substituteInPlace $out/bin/checksec --replace "/usr/bin/id -" "${coreutils}/bin/id -"
''; '';

2
pkgs/os-specific/linux/gradm/default.nix
View File

@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
"FLEX=${flex}/bin/flex" "FLEX=${flex}/bin/flex"
"BISON=${bison}/bin/bison" "BISON=${bison}/bin/bison"
"FIND=${findutils}/bin/find" "FIND=${findutils}/bin/find"
"STRIP=${binutils}/bin/strip" "STRIP=${binutils.out}/bin/strip"
"INSTALL=${coreutils}/bin/install" "INSTALL=${coreutils}/bin/install"
"MANDIR=/share/man" "MANDIR=/share/man"
"MKNOD=true" "MKNOD=true"