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/interpreters/dart/default.nix
View File

@@ -26,7 +26,7 @@ stdenv.mkDerivation {
mkdir -p $out
cp -R * $out/
echo $libPath
patchelf --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \
patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath $libPath \
$out/bin/dart
'';

2
pkgs/development/interpreters/rebol/default.nix
View File

@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
configurePhase = ''
cp ${r3} make/r3-make
chmod 777 make/r3-make
patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" ./make/r3-make
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./make/r3-make
cd make
perl -pi -e 's#-m32##g' makefile
perl -pi -e 's#sudo .*#echo#g' makefile