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

Revert "Merge pull request #28557 from obsidiansystems/binutils-wrapper"

Browse Source 
This reverts commit 0a944b345e, reversing
changes made to 61733ed6cc.

I dislike these massive stdenv changes with unclear motivation,
especially when they involve gratuitous mass renames like NIX_CC ->
NIX_BINUTILS. The previous such rename (NIX_GCC -> NIX_CC) caused
months of pain, so let's not do that again.
This commit is contained in:
Eelco Dolstra
2017-09-07 12:22:33 +02:00
parent d38ee5b46c
commit ec8d41f08c
183 changed files with 548 additions and 881 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/tools/misc/saleae-logic/default.nix
View File

@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
cp -r * "$out"
# Patch it
patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" "$out/Logic"
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/Logic"
patchelf --set-rpath "${stdenv.cc.cc.lib}/lib:${stdenv.cc.cc.lib}/lib64:${libPath}:\$ORIGIN/Analyzers:\$ORIGIN" "$out/Logic"
# Build the LD_PRELOAD library that makes Logic work from a read-only directory