pyrox.dev
treewide: Mass replace 'binutils}/bin' to refer to the correct outputs
authored by Tuomas Tynkkynen and committed by Tuomas Tynkkynen 794f07d4 f34655e2
+1
-1
pkgs/development/compilers/rustc/generic.nix
+1
-1
pkgs/development/compilers/rustc/generic.nix
···
123
123
configureFlags = configureFlags
124
124
++ [ "--enable-local-rust" "--local-rust-root=$snapshot" "--enable-rpath" ]
125
125
# ++ [ "--jemalloc-root=${jemalloc}/lib"
126
-
++ [ "--default-linker=${stdenv.cc}/bin/cc" "--default-ar=${binutils}/bin/ar" ]
126
+
++ [ "--default-linker=${stdenv.cc}/bin/cc" "--default-ar=${binutils.out}/bin/ar" ]
127
127
++ optional (stdenv.cc.cc ? isClang) "--enable-clang"
128
128
++ optional (!forceBundledLLVM) "--llvm-root=${llvmShared}";
129
129
+3
-3
pkgs/os-specific/linux/checksec/default.nix
+3
-3
pkgs/os-specific/linux/checksec/default.nix
···
25
25
substituteInPlace $out/bin/checksec --replace find ${findutils}/bin/find
26
26
substituteInPlace $out/bin/checksec --replace "file $" "${file}/bin/file $"
27
27
substituteInPlace $out/bin/checksec --replace "xargs file" "xargs ${file}/bin/file"
28
-
substituteInPlace $out/bin/checksec --replace " readelf -" " ${binutils}/bin/readelf -"
29
-
substituteInPlace $out/bin/checksec --replace "(readelf -" "(${binutils}/bin/readelf -"
30
-
substituteInPlace $out/bin/checksec --replace "command_exists readelf" "command_exists ${binutils}/bin/readelf"
28
+
substituteInPlace $out/bin/checksec --replace " readelf -" " ${binutils.out}/bin/readelf -"
29
+
substituteInPlace $out/bin/checksec --replace "(readelf -" "(${binutils.out}/bin/readelf -"
30
+
substituteInPlace $out/bin/checksec --replace "command_exists readelf" "command_exists ${binutils.out}/bin/readelf"
31
31
substituteInPlace $out/bin/checksec --replace "/sbin/sysctl -" "${procps}/sbin/sysctl -"
32
32
substituteInPlace $out/bin/checksec --replace "/usr/bin/id -" "${coreutils}/bin/id -"
33
33
'';
+1
-1
pkgs/os-specific/linux/gradm/default.nix
+1
-1
pkgs/os-specific/linux/gradm/default.nix