diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2017-09-07 12:22:33 +0200 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2017-09-07 12:51:21 +0200 |
| commit | ec8d41f08c95cff79ccb28132146226f4f75c6fe (patch) | |
| tree | c371a0c81a6f2e9a6a06489daf4a4e4cff393081 /pkgs/development/tools/misc | |
| parent | d38ee5b46c5ca7d479786a4fa40efd53dcd748ec (diff) | |
| download | nixlib-ec8d41f08c95cff79ccb28132146226f4f75c6fe.tar nixlib-ec8d41f08c95cff79ccb28132146226f4f75c6fe.tar.gz nixlib-ec8d41f08c95cff79ccb28132146226f4f75c6fe.tar.bz2 nixlib-ec8d41f08c95cff79ccb28132146226f4f75c6fe.tar.lz nixlib-ec8d41f08c95cff79ccb28132146226f4f75c6fe.tar.xz nixlib-ec8d41f08c95cff79ccb28132146226f4f75c6fe.tar.zst nixlib-ec8d41f08c95cff79ccb28132146226f4f75c6fe.zip | |
Revert "Merge pull request #28557 from obsidiansystems/binutils-wrapper"
This reverts commit 0a944b345e89ca0096974d168f49e1c6830c3fc2, reversing changes made to 61733ed6ccde3427016720f2e0cd191d3d95152c. 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.
Diffstat (limited to 'pkgs/development/tools/misc')
| -rw-r--r-- | pkgs/development/tools/misc/saleae-logic/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/tools/misc/saleae-logic/default.nix b/pkgs/development/tools/misc/saleae-logic/default.nix index 5a20a2ac1674..86be86cb6d63 100644 --- a/pkgs/development/tools/misc/saleae-logic/default.nix +++ b/pkgs/development/tools/misc/saleae-logic/default.nix @@ -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 |