ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-20 08:59:32 +03:00
Code Issues Projects Releases Wiki Activity

misc pkgs: Use $NIX_BINUTILS for when needed

Browse Source 
Certain files are now only there instead of $NIX_CC (some are in both)
This commit is contained in:
John Ericson 2017-08-28 16:07:06 -04:00
parent 40e9b2a7e6
commit 3f30cffa55
155 changed files with 189 additions and 186 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/audio/google-musicmanager/default.nix
View File

@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
buildPhase = ''
patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \
--set-rpath "$out/opt/google/musicmanager:${stdenv.lib.makeLibraryPath [ readline ncurses stdenv.cc.libc.out qt48 stdenv.cc.cc libidn expat flac libvorbis ]}" opt/google/musicmanager/MusicManager
'';

2
pkgs/applications/audio/google-play-music-desktop-player/default.nix
View File

@ -61,7 +61,7 @@ stdenv.mkDerivation {
cp -r ./usr/share $out
cp -r ./usr/bin $out
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \
"$out/share/google-play-music-desktop-player/Google Play Music Desktop Player"
wrapProgram $out/bin/google-play-music-desktop-player \

2
pkgs/applications/audio/renoise/default.nix
View File

@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
mkdir $out/bin
ln -s $out/renoise $out/bin/renoise
patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) --set-rpath $out/lib $out/renoise
patchelf --set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) --set-rpath $out/lib $out/renoise
'';
meta = {

2
pkgs/applications/audio/spotify/default.nix
View File

@ -89,7 +89,7 @@ stdenv.mkDerivation {
rpath="$out/share/spotify:$libdir"
patchelf \
--interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \
--set-rpath $rpath $out/share/spotify/spotify
librarypath="${stdenv.lib.makeLibraryPath deps}:$libdir"

4
pkgs/applications/editors/atom/default.nix
View File

@ -25,10 +25,10 @@ stdenv.mkDerivation rec {
fixupPhase
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \
--set-rpath "${atomEnv.libPath}:$out/share/atom" \
$out/share/atom/atom
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \
--set-rpath "${atomEnv.libPath}" \
$out/share/atom/resources/app/apm/bin/node

4
pkgs/applications/editors/brackets/default.nix
View File

@ -36,11 +36,11 @@ stdenv.mkDerivation rec {
'';
postFixup = ''
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \
--set-rpath "${bracketsLibs}:$out/opt/brackets/lib" \
$out/opt/brackets/Brackets
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \
--set-rpath "${bracketsLibs}" \
$out/opt/brackets/Brackets-node

2
pkgs/applications/editors/jetbrains/default.nix
View File

@ -35,7 +35,7 @@ let
ln -s ${cmake} bin/cmake
lldbLibPath=$out/clion-${version}/bin/lldb/lib
interp="$(cat $NIX_CC/nix-support/dynamic-linker)"
interp="$(cat $NIX_BINUTILS/nix-support/dynamic-linker)"
ln -s ${ncurses.out}/lib/libncurses.so $lldbLibPath/libtinfo.so.5
patchelf --set-interpreter $interp \

14
pkgs/applications/editors/kodestudio/default.nix
View File

@ -50,31 +50,31 @@ in
postFixup = lib.optionalString (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") ''
# Patch Binaries
patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \
--set-rpath "$out:${atomEnv.libPath}" \
$out/kodestudio
patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \
--set-rpath ".:${stdenv.cc.libc}/lib:${xorg.libXinerama}/lib:${xorg.libX11}/lib:${alsaLib}/lib:${mesa}/lib:${openssl.out}/lib" \
$out/resources/app/extensions/krom/Krom/linux/Krom
patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \
--set-rpath ".:${stdenv.cc.libc}/lib" \
$out/resources/app/extensions/kha/Kha/Kore/Tools/krafix/krafix-linux64
patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \
--set-rpath ".:${stdenv.cc.libc}/lib" \
$out/resources/app/extensions/kha/Kha/Kore/Tools/kraffiti/kraffiti-linux64
patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \
--set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" \
$out/resources/app/extensions/kha/Kha/Tools/kravur/kravur-linux64
patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \
--set-rpath ".:${stdenv.cc.libc}/lib:${zlib}/lib" \
$out/resources/app/extensions/kha/Kha/Tools/haxe/haxe-linux64
patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \
--set-rpath ".:${stdenv.cc.libc}/lib:${libvorbis}/lib:${libogg}/lib:${flac.out}/lib" \
$out/resources/app/extensions/kha/Kha/Tools/oggenc/oggenc-linux64

2
pkgs/applications/editors/lighttable/default.nix
View File

@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
mv ./${name}-linux/* $out/share/LightTable
patchelf \
--interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \
--set-rpath ${libPath}:${libPath}/lib64:$out/share/LightTable \
$out/share/LightTable/LightTable

2
pkgs/applications/editors/sublime/default.nix
View File

@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
echo ${libPath}
patchelf \
--interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \
--set-rpath ${libPath}:${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"} \
$out/sublime/sublime_text

2
pkgs/applications/editors/sublime3/default.nix
View File

@ -50,7 +50,7 @@ in let
buildPhase = ''
for i in sublime_text plugin_host crash_reporter; do
patchelf \
--interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \
--set-rpath ${libPath}:${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"} \
$i
done

2
pkgs/applications/editors/typora/default.nix
View File

@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
postFixup = ''
patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \
--set-rpath "$out/share/typora:${rpath}" "$out/share/typora/Typora"
ln -s "$out/share/typora/Typora" "$out/bin/typora"

2
pkgs/applications/editors/vscode/default.nix
View File

@ -69,7 +69,7 @@ in
postFixup = lib.optionalString (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") ''
patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \
--set-rpath "${rpath}" \
$out/lib/vscode/code
'';

2
pkgs/applications/graphics/draftsight/default.nix
View File

@ -26,7 +26,7 @@ stdenv.mkDerivation {
mkdir $out/bin
for exe in DraftSight dsHttpApiController dsHttpApiService FxCrashRptApp HelpGuide; do
echo "Patching $exe..."
patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
patchelf --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \
--set-rpath $libPath:\$ORIGIN/../Libraries \
$out/draftsight/opt/dassault-systemes/DraftSight/Linux/$exe
makeWrapper $out/draftsight/opt/dassault-systemes/DraftSight/Linux/$exe \

2
pkgs/applications/misc/adobe-reader/builder.sh
View File

@ -17,7 +17,7 @@ rm $p/Reader/intellinux/plug_ins/PPKLite.api
# More pointless files.
rm $p/bin/UNINSTALL
patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
patchelf --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \
--set-rpath $libPath \
$p/Reader/intellinux/bin/acroread

2
pkgs/applications/misc/googleearth/default.nix
View File

@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
rm $out/bin/google-earth $out/opt/google/earth/free/google-earth
ln -s $out/opt/google/earth/free/googleearth $out/bin/google-earth
patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
patchelf --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \
--set-rpath "${fullPath}:\$ORIGIN" \
$out/opt/google/earth/free/googleearth-bin

2
pkgs/applications/misc/houdini/runtime.nix
View File

@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
echo "export QT_XKB_CONFIG_ROOT="${xkeyboardconfig}/share/X11/xkb"" >> $out/houdini/sbin/app_init.sh
'';
postFixup = ''
INTERPRETER="$(cat "$NIX_CC"/nix-support/dynamic-linker)"
INTERPRETER="$(cat "$NIX_BINUTILS/nix-support/dynamic-linker")"
for BIN in $(find $out/bin -type f -executable); do
if patchelf $BIN 2>/dev/null ; then
echo "Patching ELF $BIN"

2
pkgs/applications/misc/hyper/default.nix
View File

@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
mkdir -p "$out/bin"
mv opt "$out/"
ln -s "$out/opt/Hyper/hyper" "$out/bin/hyper"
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${libPath}:\$ORIGIN" "$out/opt/Hyper/hyper"
patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" --set-rpath "${libPath}:\$ORIGIN" "$out/opt/Hyper/hyper"
mv usr/* "$out/"
'';
dontPatchELF = true;

4
pkgs/applications/misc/ipmiview/default.nix
View File

@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
buildPhase = with xorg; ''
patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ libX11 libXext libXrender libXtst libXi ]}" ./jre/lib/amd64/xawt/libmawt.so
patchelf --set-rpath "${gcc.cc}/lib" ./libiKVM64.so
patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ libXcursor libX11 libXext libXrender libXtst libXi ]}" --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./jre/bin/javaws
patchelf --set-rpath "${gcc.cc}/lib:$out/jre/lib/amd64/jli" --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./jre/bin/java
patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ libXcursor libX11 libXext libXrender libXtst libXi ]}" --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" ./jre/bin/javaws
patchelf --set-rpath "${gcc.cc}/lib:$out/jre/lib/amd64/jli" --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" ./jre/bin/java
'';
installPhase = ''

2
pkgs/applications/misc/kdbplus/default.nix
View File

@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
mkdir -p $out/bin $out/libexec
patchelf \
--interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \
--set-rpath ${libPath} \
./q/l32/q
mv ./q/l32/q $out/libexec/q

2
pkgs/applications/misc/kiwix/default.nix
View File

@ -92,7 +92,7 @@ stdenv.mkDerivation rec {
postInstall = ''
cp -r src/dependencies/xulrunner $out/lib/kiwix
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/lib/kiwix/xulrunner/xulrunner
patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" $out/lib/kiwix/xulrunner/xulrunner
rm $out/bin/kiwix
makeWrapper $out/lib/kiwix/kiwix-launcher $out/bin/kiwix \

2
pkgs/applications/misc/rescuetime/default.nix
View File

@ -33,7 +33,7 @@ stdenv.mkDerivation {
cp usr/bin/rescuetime $out/bin
${patchelf}/bin/patchelf \
--interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \
$out/bin/rescuetime
wrapProgram $out/bin/rescuetime \

2
pkgs/applications/misc/simplenote/default.nix
View File

@ -47,7 +47,7 @@
fixupPhase
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \
--set-rpath "${libPath}:$out/share/simplenote" \
$out/share/simplenote/simplenote

2
pkgs/applications/networking/bittorrentsync/generic.nix
View File

@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
installPhase = ''
install -D btsync "$out/bin/btsync"
patchelf --interpreter "$(< $NIX_CC/nix-support/dynamic-linker)" --set-rpath ${libPath} "$out/bin/btsync"
patchelf --interpreter "$(< $NIX_BINUTILS/nix-support/dynamic-linker)" --set-rpath ${libPath} "$out/bin/btsync"
'';
meta = {

2
pkgs/applications/networking/browsers/firefox-bin/default.nix
View File

@ -152,7 +152,7 @@ stdenv.mkDerivation {
updater crashreporter webapprt-stub
do
if [ -e "$out/usr/lib/firefox-bin-${version}/$executable" ]; then
patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
patchelf --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \
"$out/usr/lib/firefox-bin-${version}/$executable"
fi
done

2
pkgs/applications/networking/browsers/google-chrome/default.nix
View File

@ -130,7 +130,7 @@ in stdenv.mkDerivation rec {
for elf in $out/share/google/$appname/{chrome,chrome-sandbox,nacl_helper}; do
patchelf --set-rpath $rpath $elf
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $elf
patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" $elf
done
'';

2
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
View File

@ -118,7 +118,7 @@ stdenv.mkDerivation rec {
$out/lib${lib_suffix}/kde4/kcm_adobe_flash_player.so
patchelf \
--set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
--set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) \
--set-rpath "$rpath" \
$out/bin/flash-player-properties
'';

2
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
View File

@ -84,7 +84,7 @@ stdenv.mkDerivation rec {
cp -pv flashplayer${lib.optionalString debug "debugger"} $out/bin
patchelf \
--set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
--set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) \
--set-rpath "$rpath" \
$out/bin/flashplayer${lib.optionalString debug "debugger"}
'';

2
pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
View File

@ -88,7 +88,7 @@ stdenv.mkDerivation rec {
cp -prd opt/google/talkplugin/{data,GoogleTalkPlugin,locale,remoting24x24.png,windowpicker.glade} $out/libexec/google/talkplugin/
patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \
--set-rpath "${rpathProgram}:${stdenv.cc.cc.lib}/lib64" \
$out/libexec/google/talkplugin/GoogleTalkPlugin

2
pkgs/applications/networking/browsers/opera/default.nix
View File

@ -114,7 +114,7 @@ in stdenv.mkDerivation {
| while read f
do
patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \
--set-rpath "$out/lib:${rpath}" \
"$f"
done

2
pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
View File

@ -129,7 +129,7 @@ stdenv.mkDerivation rec {
buildCommand = ''
# For convenience ...
TBB_IN_STORE=$out/share/tor-browser
interp=$(< $NIX_CC/nix-support/dynamic-linker)
interp=$(< $NIX_BINUTILS/nix-support/dynamic-linker)
# Unpack & enter
mkdir -p "$TBB_IN_STORE"

2
pkgs/applications/networking/browsers/vivaldi/default.nix
View File

@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
buildPhase = ''
echo "Patching Vivaldi binaries"
patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \
--set-rpath "${libPath}" \
opt/vivaldi/vivaldi-bin
'' + stdenv.lib.optionalString proprietaryCodecs ''

2
pkgs/applications/networking/cluster/hadoop/default.nix
View File

@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
sed -i $n -e "s|#!/usr/bin/env bash|#! ${bash}/bin/bash|"
done
'' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" bin/container-executor;
patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" bin/container-executor;
'';
installPhase = ''

2
pkgs/applications/networking/dropbox/default.nix
View File

@ -108,7 +108,7 @@ in mkDerivation {
'';
preFixup = ''
INTERP=$(cat $NIX_CC/nix-support/dynamic-linker)
INTERP=$(cat $NIX_BINUTILS/nix-support/dynamic-linker)
RPATH="${ldpath}:$out/${appdir}"
getType='s/ *Type: *\([A-Z]*\) (.*/\1/'
find "$out/${appdir}" -type f -print | while read obj; do

2
pkgs/applications/networking/instant-messengers/discord/default.nix
View File

@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
# Copying how adobe-reader does it,
# see pkgs/applications/misc/adobe-reader/builder.sh
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \
--set-rpath "$out/opt/discord:$libPath" \
$out/opt/discord/Discord

2
pkgs/applications/networking/instant-messengers/franz/default.nix
View File

@ -44,7 +44,7 @@ in stdenv.mkDerivation rec {
'';
installPhase = ''
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" Franz
patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" Franz
patchelf --set-rpath "$out/opt/franz:${stdenv.lib.makeLibraryPath deps}" Franz
mkdir -p $out/bin $out/opt/franz

2
pkgs/applications/networking/instant-messengers/hipchat/default.nix
View File

@ -68,7 +68,7 @@ stdenv.mkDerivation {
mv usr/share $out
for file in $(find $d -type f); do
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $file || true
patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" $file || true
patchelf --set-rpath ${rpath}:$out/libexec/hipchat/lib:\$ORIGIN $file || true
done

2
pkgs/applications/networking/instant-messengers/messenger-for-desktop/default.nix
View File

@ -72,7 +72,7 @@ in stdenv.mkDerivation {
# patch the binaries
for file in $(find $out -type f \( -perm /0111 -o -name \*.so\* \) ); do
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$file" || true
patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" "$file" || true
patchelf --set-rpath ${rpath}:$out/libexec $file || true
done

2
pkgs/applications/networking/instant-messengers/rambox/default.nix
View File

@ -44,7 +44,7 @@ in stdenv.mkDerivation rec {
dontPatchELF = true;
installPhase = ''
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" rambox
patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" rambox
patchelf --set-rpath "$out/opt/rambox:${stdenv.lib.makeLibraryPath deps}" rambox
mkdir -p $out/bin $out/opt/rambox

2
pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
View File

@ -78,7 +78,7 @@ in stdenv.mkDerivation {
postFixup = ''
patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \
--set-rpath "$out/share/skypeforlinux:${rpath}" "$out/share/skypeforlinux/skypeforlinux"
ln -s "$out/share/skypeforlinux/skypeforlinux" "$out/bin/skypeforlinux"

2
pkgs/applications/networking/instant-messengers/slack/default.nix
View File

@ -68,7 +68,7 @@ in stdenv.mkDerivation {
chmod -R g-w $out
for file in $(find $out -type f \( -perm /0111 -o -name \*.so\* \) ); do
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$file" || true
patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" "$file" || true
patchelf --set-rpath ${rpath}:$out/lib/slack $file || true
done

2
pkgs/applications/networking/instant-messengers/teamspeak/client.nix
View File

@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
mv ts3client_linux_${arch} ts3client
echo "patching ts3client..."
patchelf \
--interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \
--set-rpath ${stdenv.lib.makeLibraryPath deps}:$(cat $NIX_CC/nix-support/orig-cc)/${libDir} \
--force-rpath \
ts3client

4
pkgs/applications/networking/instant-messengers/teamspeak/server.nix
View File

@ -25,13 +25,13 @@ stdenv.mkDerivation {
''
echo "patching ts3server"
patchelf \
--interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \
--set-rpath $(cat $NIX_CC/nix-support/orig-cc)/${libDir} \
--force-rpath \
ts3server
cp tsdns/tsdnsserver tsdnsserver
patchelf \
--interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \
--set-rpath $(cat $NIX_CC/nix-support/orig-cc)/${libDir} \
--force-rpath \
tsdnsserver

2
pkgs/applications/networking/instant-messengers/viber/default.nix
View File

@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
chmod -R g-w $out
for file in $(find $out -type f \( -perm /0111 -o -name \*.so\* \) ); do
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$file" || true
patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" "$file" || true
patchelf --set-rpath $libPath:$out/opt/viber/lib $file || true
done

8
pkgs/applications/networking/instant-messengers/zoom-us/default.nix
View File

@ -65,10 +65,10 @@ in stdenv.mkDerivation {
mkdir -p $out/bin
cp -ar * $packagePath
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $packagePath/zoom
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $packagePath/QtWebEngineProcess
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $packagePath/qtdiag
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $packagePath/zopen
patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" $packagePath/zoom
patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" $packagePath/QtWebEngineProcess
patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" $packagePath/qtdiag
patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" $packagePath/zopen
# included from https://github.com/NixOS/nixpkgs/commit/fc218766333a05c9352b386e0cbb16e1ae84bf53
# it works for me without it, but, well...
paxmark m $packagePath/zoom

2
pkgs/applications/networking/insync/default.nix
View File

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
buildInputs = [ makeWrapper ];
postPatch = ''
patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" client/insync-portable
patchelf --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" client/insync-portable
'';
installPhase = ''

4
pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix
View File

@ -107,7 +107,7 @@ stdenv.mkDerivation rec {
# Patch binaries
binrp=$(patchelf --print-rpath $out/share/nylas-mail/nylas)
patchelf --interpreter $(cat "$NIX_CC"/nix-support/dynamic-linker) \
patchelf --interpreter $(cat "$NIX_BINUTILS/nix-support/dynamic-linker") \
--set-rpath $binrp:$out/lib:${stdenv.cc.cc.lib}/lib:${lib.makeLibraryPath propagatedBuildInputs } \
$out/share/nylas-mail/nylas
@ -119,7 +119,7 @@ stdenv.mkDerivation rec {
wrapProgram $out/share/nylas-mail/resources/apm/bin/apm \
--set PATH "${coreutils}/bin"
patchelf --interpreter $(cat "$NIX_CC"/nix-support/dynamic-linker) \
patchelf --interpreter $(cat "$NIX_BINUTILS/nix-support/dynamic-linker") \
--set-rpath ${gcc-unwrapped.lib}/lib $out/share/nylas-mail/resources/apm/bin/node
'';

2
pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
View File

@ -134,7 +134,7 @@ stdenv.mkDerivation {
for executable in \
thunderbird crashreporter thunderbird-bin plugin-container updater
do
patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
patchelf --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \
"$out/usr/lib/thunderbird-bin-${version}/$executable"
done

2
pkgs/applications/networking/remote/anydesk/default.nix
View File

@ -41,7 +41,7 @@ in stdenv.mkDerivation rec {
postFixup = ''
patchelf \
--set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
--set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) \
--set-rpath "${libPath}" \
$out/bin/anydesk

2
pkgs/applications/networking/remote/citrix-receiver/default.nix
View File

@ -131,7 +131,7 @@ in stdenv.mkDerivation rec {
echo "Patching ELF intrepreter and rpath for $f"
chmod u+w "$f"
patchelf \
--set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
--set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) \
--set-rpath "$ICAInstDir:$libPath" "$f"
done

2
pkgs/applications/networking/resilio-sync/default.nix
View File

@ -25,7 +25,7 @@ in stdenv.mkDerivation rec {
installPhase = ''
install -D rslsync "$out/bin/rslsync"
patchelf \
--interpreter "$(< $NIX_CC/nix-support/dynamic-linker)" \
--interpreter "$(< $NIX_BINUTILS/nix-support/dynamic-linker)" \
--set-rpath ${libPath} "$out/bin/rslsync"
'';

2
pkgs/applications/office/marp/default.nix
View File

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
'';
postFixup = ''
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \
--set-rpath "${atomEnv.libPath}:${stdenv.lib.makeLibraryPath [ libXScrnSaver ]}:$out/lib/marp" \
$out/bin/Marp
'';

4
pkgs/applications/office/moneyplex/default.nix
View File

@ -78,9 +78,9 @@ stdenv.mkDerivation rec {
${coreutils}/bin/cp "\$MDIR/moneyplex" "\$MDIR/moneyplex.patched"
${coreutils}/bin/chmod 0755 "\$MDIR/moneyplex.patched"
fi
if [ ! \`${patchelf}/bin/patchelf --print-interpreter \$MDIR/moneyplex.patched\` = $(cat $NIX_CC/nix-support/dynamic-linker) ] ||
if [ ! \`${patchelf}/bin/patchelf --print-interpreter \$MDIR/moneyplex.patched\` = $(cat $NIX_BINUTILS/nix-support/dynamic-linker) ] ||
[ ! \`${patchelf}/bin/patchelf --print-rpath \$MDIR/moneyplex.patched\` = "${libPath}" ]; then
${patchelf}/bin/patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) --set-rpath "${libPath}" "\$MDIR/moneyplex.patched"
${patchelf}/bin/patchelf --set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) --set-rpath "${libPath}" "\$MDIR/moneyplex.patched"
fi
exec \$MDIR/moneyplex.patched

2
pkgs/applications/office/wpsoffice/default.nix
View File

@ -53,7 +53,7 @@ in stdenv.mkDerivation rec{
mkdir $out/bin
for i in wps wpp et; do
patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \
--force-rpath --set-rpath "$prefix/office6:$libPath" \
$prefix/office6/$i

2
pkgs/applications/science/electronics/eagle/default.nix
View File

@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
gcc -shared -fPIC -DEAGLE_PATH=\"$out/eagle-${version}\" ${./eagle_fixer.c} -o "$out"/lib/eagle_fixer.so -ldl
# Make wrapper script
dynlinker="$(cat $NIX_CC/nix-support/dynamic-linker)"
dynlinker="$(cat $NIX_BINUTILS/nix-support/dynamic-linker)"
mkdir -p "$out"/bin
cat > "$out"/bin/eagle << EOF
#!${stdenv.shell}

2
pkgs/applications/science/logic/saw-tools/default.nix
View File

@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
fixupPhase = ''
for x in bin/bcdump bin/extcore-info bin/jss bin/llvm-disasm bin/lss bin/saw; do
patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
patchelf --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \
--set-rpath "$out/lib:${libPath}" $out/$x;
done
'';

2
pkgs/applications/science/logic/tptp/default.nix
View File

@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
substituteInPlace $sharedir/TPTP2X/tptp2X_install --replace /bin/mv mv
tcsh $sharedir/TPTP2X/tptp2X_install -default
patchelf --interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $sharedir/Scripts/tptp4X
patchelf --interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) $sharedir/Scripts/tptp4X
mkdir -p $out/bin
ln -s $sharedir/TPTP2X/tptp2X $out/bin

2
pkgs/applications/science/logic/verifast/default.nix
View File

@ -10,7 +10,7 @@ let
] + ":${stdenv.cc.cc.lib}/lib64";
patchExe = x: ''
patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
patchelf --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \
--set-rpath ${libPath} ${x}
'';
in

2
pkgs/applications/science/math/mathematica/10.nix
View File

@ -106,7 +106,7 @@ stdenv.mkDerivation rec {
echo "patching $f executable <<"
patchelf --shrink-rpath "$f"
patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \
--set-rpath "$(patchelf --print-rpath "$f"):${ldpath}" \
"$f" \
&& patchelf --shrink-rpath "$f" \

2
pkgs/applications/science/math/mathematica/9.nix
View File

@ -93,7 +93,7 @@ stdenv.mkDerivation rec {
elif [ "$type" == "EXEC" ]; then
echo "patching $f executable <<"
patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \
--set-rpath "${ldpath}" \
"$f"
patchelf --shrink-rpath "$f"

2
pkgs/applications/science/math/mathematica/default.nix
View File

@ -114,7 +114,7 @@ stdenv.mkDerivation rec {
echo "patching $f executable <<"
patchelf --shrink-rpath "$f"
patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \
--set-rpath "$(patchelf --print-rpath "$f"):${ldpath}" \
"$f" \
&& patchelf --shrink-rpath "$f" \

2
pkgs/applications/science/math/scilab-bin/default.nix
View File

@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
fullLibPath="$sci/lib/scilab:$sci/lib/thirdparty:$libPath"
fullLibPath="$fullLibPath:$sci/lib/thirdparty/redist"
patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
patchelf --set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) \
--set-rpath "$fullLibPath" bin/scilab-bin
find . -name '*.so' -type f | while read file; do
patchelf --set-rpath "$fullLibPath" "$file" 2>/dev/null

4
pkgs/applications/science/medicine/aliza/default.nix
View File

@ -29,11 +29,11 @@ stdenv.mkDerivation {
libs = stdenv.lib.makeLibraryPath [ qt4 zlib stdenv.cc.cc libSM libICE libX11 libXext libXt mesa ];
in ''
${patchelf}/bin/patchelf \
--interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \
$out/bin/aliza
${patchelf}/bin/patchelf \
--interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \
$out/bin/aliza-vtkvol
wrapProgram $out/bin/aliza \

2
pkgs/applications/science/programming/fdr/default.nix
View File

@ -33,7 +33,7 @@ stdenv.mkDerivation {
for b in fdr4 _fdr4 refines _refines cspmprofiler cspmexplorerprof
do
patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
patchelf --set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) \
--set-rpath "$libPath:$out/lib" \
"$out/bin/$b"
done

2
pkgs/applications/taxes/aangifte-2006/builder.sh
View File

@ -3,7 +3,7 @@ source $stdenv/setup
buildPhase() {
for i in bin/*; do
patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \
--set-rpath $libX11/lib:$libXext/lib \
$i
done

2
pkgs/applications/taxes/aangifte-2007/builder.sh
View File

@ -5,7 +5,7 @@ echo $NIX_CC
buildPhase() {
for i in bin/*; do
patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \
--set-rpath $libX11/lib:$libXext/lib:$libSM/lib:$(cat $NIX_CC/nix-support/orig-cc)/lib \
$i
done

2
pkgs/applications/taxes/aangifte-2008/builder.sh
View File

@ -5,7 +5,7 @@ echo $NIX_CC
buildPhase() {
for i in bin/*; do
patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \
--set-rpath $libX11/lib:$libXext/lib:$libSM/lib:$(cat $NIX_CC/nix-support/orig-cc)/lib \
$i
done

2
pkgs/applications/taxes/aangifte-2009/default.nix
View File

@ -17,7 +17,7 @@ stdenv.mkDerivation {
''
for i in bin/*; do
patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \
--set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \
$i
done

2
pkgs/applications/taxes/aangifte-2010/default.nix
View File

@ -17,7 +17,7 @@ stdenv.mkDerivation {
''
for i in bin/*; do
patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \
--set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \
$i
done

2
pkgs/applications/taxes/aangifte-2011/default.nix
View File

@ -17,7 +17,7 @@ stdenv.mkDerivation {
''
for i in bin/*; do
patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \
--set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \
$i
done

2
pkgs/applications/taxes/aangifte-2012/default.nix
View File

@ -17,7 +17,7 @@ stdenv.mkDerivation {
''
for i in bin/*; do
patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \
--set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \
$i
done

2
pkgs/applications/taxes/aangifte-2013-wa/default.nix
View File

@ -17,7 +17,7 @@ stdenv.mkDerivation {
''
for i in bin/*; do
patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \
--set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \
$i
done

2
pkgs/applications/taxes/aangifte-2013/default.nix
View File

@ -17,7 +17,7 @@ stdenv.mkDerivation {
''
for i in bin/*; do
patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \
--set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \
$i
done

2
pkgs/applications/taxes/aangifte-2014-wa/default.nix
View File

@ -17,7 +17,7 @@ stdenv.mkDerivation {
''
for i in bin/*; do
patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \
--set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \
$i
done

2
pkgs/applications/taxes/aangifte-2014/default.nix
View File

@ -17,7 +17,7 @@ stdenv.mkDerivation {
''
for i in bin/*; do
patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \
--set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \
$i
done

2
pkgs/applications/version-management/gitkraken/default.nix
View File

@ -80,7 +80,7 @@ stdenv.mkDerivation rec {
'';
postFixup = ''
patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
patchelf --set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) \
--set-rpath "$libPath:$out/opt/gitkraken" "$out/opt/gitkraken/gitkraken"
wrapProgram $out/opt/gitkraken/gitkraken \
--prefix LD_PRELOAD : "${makeLibraryPath [ curl ]}/libcurl.so.4" \

2
pkgs/applications/video/makemkv/builder.sh
View File

@ -27,7 +27,7 @@ libPath="${libPath}:${out}/lib" # XXX: der. This should be in the nix file?
for i in ${bin} ; do
patchelf \
--interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \
--set-rpath $libPath \
${i}
done

2
pkgs/desktops/maxx/default.nix
View File

@ -59,7 +59,7 @@ in stdenv.mkDerivation {
while IFS= read -r -d ''$'\0' i; do
if isELF "$i"; then
bin=`patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$i"; echo $?`
bin=`patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" "$i"; echo $?`
patchelf --set-rpath "${stdenv.lib.makeLibraryPath deps}" "$i"
if [ "$bin" -eq 0 ]; then
wrapProgram "$i" \

6
pkgs/development/arduino/arduino-core/default.nix
View File

@ -135,7 +135,7 @@ stdenv.mkDerivation rec {
cp ${teensyduino_src} ./TeensyduinoInstall.${teensy_architecture}
chmod +w ./TeensyduinoInstall.${teensy_architecture}
upx -d ./TeensyduinoInstall.${teensy_architecture}
patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
patchelf --set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) \
--set-rpath "${teensy_libpath}" \
./TeensyduinoInstall.${teensy_architecture}
chmod +x ./TeensyduinoInstall.${teensy_architecture}
@ -181,7 +181,7 @@ stdenv.mkDerivation rec {
preFixup = ''
for file in $(find $out -type f \( -perm /0111 -o -name \*.so\* \) ); do
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$file" || true
patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" "$file" || true
patchelf --set-rpath ${rpath}:$out/lib $file || true
done
@ -203,7 +203,7 @@ stdenv.mkDerivation rec {
${stdenv.lib.optionalString withTeensyduino ''
# Patch the Teensy loader binary
patchelf --debug \
--set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
--set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) \
--set-rpath "${teensy_libpath}" \
$out/share/arduino/hardware/tools/teensy
''}

2
pkgs/development/compilers/cmucl/binary.nix
View File

@ -24,7 +24,7 @@ stdenv.mkDerivation {
buildCommand = ''
mkdir -p $out
tar -C $out -xjf ${dist}
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \
$out/bin/lisp
'';

2
pkgs/development/compilers/crystal/default.nix
View File

@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
--suffix DYLD_LIBRARY_PATH : $libPath
''
else ''
patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
patchelf --set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) \
crystal-${version}-1/embedded/bin/crystal
patchelf --set-rpath ${ stdenv.lib.makeLibraryPath [ stdenv.cc.cc ] } \
crystal-${version}-1/embedded/bin/crystal

2
pkgs/development/compilers/cudatoolkit/default.nix
View File

@ -49,7 +49,7 @@ let
echo "patching $i..."
if [[ ! $i =~ \.so ]]; then
patchelf \
--set-interpreter "''$(cat $NIX_CC/nix-support/dynamic-linker)" $i
--set-interpreter "''$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" $i
fi
rpath2=$rpath:$lib/lib:$out/jre/lib/amd64/jli:$out/lib:$out/lib64:$out/nvvm/lib:$out/nvvm/lib64
patchelf --set-rpath $rpath2 --force-rpath $i

2
pkgs/development/compilers/gcc/builder.sh
View File

@ -25,7 +25,7 @@ if test "$noSysDirs" = "1"; then
# Figure out what extra flags to pass to the gcc compilers
# being generated to make sure that they use our glibc.
extraFlags="$(cat $NIX_CC/nix-support/libc-cflags)"
extraLDFlags="$(cat $NIX_CC/nix-support/libc-ldflags) $(cat $NIX_CC/nix-support/libc-ldflags-before || true)"
extraLDFlags="$(cat $NIX_BINUTILS/nix-support/libc-ldflags) $(cat $NIX_BINUTILS/nix-support/libc-ldflags-before || true)"
# Use *real* header files, otherwise a limits.h is generated
# that does not include Glibc's limits.h (notably missing

2
pkgs/development/compilers/ghc/6.10.2-binary.nix
View File

@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
# find editline/gmp.
(if stdenv.isLinux then ''
find . -type f -perm -0100 \
-exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-exec patchelf --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \
--set-rpath "${lib.makeLibraryPath [ libedit ncurses5 gmp ]}" {} \;
for prog in ld ar gcc strip ranlib; do
find . -name "setup-config" -exec sed -i "s@/usr/bin/$prog@$(type -p $prog)@g" {} \;

2
pkgs/development/compilers/ghc/7.0.4-binary.nix
View File

@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
# find editline/gmp.
stdenv.lib.optionalString stdenv.isLinux ''
find . -type f -perm -0100 \
-exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-exec patchelf --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \
--set-rpath "${stdenv.lib.makeLibraryPath [ ncurses5 gmp ]}" {} \;
sed -i "s|/usr/bin/perl|perl\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2
sed -i "s|/usr/bin/gcc|gcc\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2

2
pkgs/development/compilers/ghc/7.4.2-binary.nix
View File

@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
mkdir -p "$out/lib"
ln -sv "${ncurses5.out}/lib/libncurses.so" "$out/lib/libncurses${stdenv.lib.optionalString stdenv.is64bit "w"}.so.5"
find . -type f -perm -0100 \
-exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-exec patchelf --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \
--set-rpath "${stdenv.lib.makeLibraryPath [ "$out" gmp ]}" {} \;
paxmark m ./ghc-${version}/ghc/stage2/build/tmp/ghc-stage2

2
pkgs/development/compilers/gnatboot/default.nix
View File

@ -21,7 +21,7 @@ stdenv.mkDerivation {
cp -R * $out
set +e
for a in $out/bin/* ; do
patchelf --interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
patchelf --interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) \
--set-rpath $(cat $NIX_CC/nix-support/orig-libc)/lib:$(cat $NIX_CC/nix-support/orig-cc)/lib64:$(cat $NIX_CC/nix-support/orig-cc)/lib $a
done
set -e

2
pkgs/development/compilers/mentor/default.nix
View File

@ -18,7 +18,7 @@ let
tar --strip-components=1 -xjf "$src" -C "$out"
# Patch binaries
interpreter="$(cat "$NIX_CC"/nix-support/dynamic-linker)"
interpreter="$(cat "$NIX_BINUTILS/nix-support/dynamic-linker")"
for file in "$out"/bin/* "$out"/libexec/gcc/*/*/* "$out"/*/bin/*; do
# Skip non-executable files
case "$file" in

2
pkgs/development/compilers/mozart/binary.nix
View File

@ -39,7 +39,7 @@ stdenv.mkDerivation {
tar xvf $src -C $out --strip-components=1
for exe in $out/bin/{ozemulator,ozwish} ; do
patchelf --set-interpreter $(< $NIX_CC/nix-support/dynamic-linker) \
patchelf --set-interpreter $(< $NIX_BINUTILS/nix-support/dynamic-linker) \
--set-rpath $libPath \
$exe
done

2
pkgs/development/compilers/opendylan/bin.nix
View File

@ -21,7 +21,7 @@ stdenv.mkDerivation {
mkdir -p "$out"
tar --strip-components=1 -xjf "$src" -C "$out"
interpreter="$(cat "$NIX_CC"/nix-support/dynamic-linker)"
interpreter="$(cat "$NIX_BINUTILS/nix-support/dynamic-linker")"
for a in "$out"/bin/*; do
patchelf --set-interpreter "$interpreter" "$a"
patchelf --set-rpath "$out/lib:${boehmgc.out}/lib" "$a"

4
pkgs/development/compilers/oraclejdk/dlj-bundle-builder.sh
View File

@ -5,7 +5,7 @@ unzip ${src} || true
# set the dynamic linker of unpack200, necessary for construct script
echo "patching unpack200"
patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "" */bin/unpack200
patchelf --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" --set-rpath "" */bin/unpack200
echo "constructing JDK and JRE installations"
if test -z "$installjdk"; then
@ -46,7 +46,7 @@ rpath=$rpath${rpath:+:}$jrePath/lib/$architecture/jli
# set all the dynamic linkers
find $out -type f -perm -0100 \
-exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-exec patchelf --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \
--set-rpath "$rpath" {} \;
find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \;

2
pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
View File

@ -179,7 +179,7 @@ let result = stdenv.mkDerivation rec {
# set all the dynamic linkers
find $out -type f -perm -0100 \
-exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-exec patchelf --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \
--set-rpath "$rpath" {} \;
find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \;

8
pkgs/development/compilers/rust/binaryBuild.nix
View File

@ -42,17 +42,17 @@ rec {
${optionalString (needsPatchelf && bootstrapping) ''
patchelf \
--set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
--set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) \
"$out/bin/rustdoc"
patchelf \
--set-rpath "${stdenv.lib.makeLibraryPath [ curl zlib ]}" \
--set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
--set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) \
"$out/bin/cargo"
''}
${optionalString needsPatchelf ''
patchelf \
--set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
--set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) \
"$out/bin/rustc"
# Do NOT, I repeat, DO NOT use `wrapProgram` on $out/bin/rustc
@ -88,7 +88,7 @@ rec {
${optionalString needsPatchelf ''
patchelf \
--set-rpath "${stdenv.lib.makeLibraryPath [ curl zlib ]}" \
--set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
--set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) \
"$out/bin/cargo"
''}

2
pkgs/development/compilers/sbcl/bootstrap.nix
View File

@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
'';
postFixup = stdenv.lib.optionalString (!stdenv.isArm && stdenv.isLinux) ''
patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $out/share/sbcl/sbcl
patchelf --set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) $out/share/sbcl/sbcl
'';
meta = with stdenv.lib; {

2
pkgs/development/compilers/tinycc/default.nix
View File

@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
echo ${version} > VERSION
configureFlagsArray+=("--cc=cc")
configureFlagsArray+=("--elfinterp=$(< $NIX_CC/nix-support/dynamic-linker)")
configureFlagsArray+=("--elfinterp=$(< $NIX_BINUTILS/nix-support/dynamic-linker)")
configureFlagsArray+=("--crtprefix=${getLib stdenv.cc.libc}/lib")
configureFlagsArray+=("--sysincludepaths=${getDev stdenv.cc.libc}/include:{B}/include")
configureFlagsArray+=("--libpaths=${getLib stdenv.cc.libc}/lib")

2
pkgs/development/compilers/zulu/default.nix
View File

@ -48,7 +48,7 @@ in stdenv.mkDerivation rec {
# set all the dynamic linkers
find $out -type f -perm -0100 \
-exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-exec patchelf --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \
--set-rpath "$rpath" {} \;
find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \;

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_CC/nix-support/dynamic-linker)" \
patchelf --interpreter "$(cat $NIX_BINUTILS/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_CC/nix-support/dynamic-linker)" ./make/r3-make
patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" ./make/r3-make
cd make
perl -pi -e 's#-m32##g' makefile
perl -pi -e 's#sudo .*#echo#g' makefile

5
pkgs/development/libraries/libstdc++5/default.nix
View File

@ -62,7 +62,10 @@ stdenv.mkDerivation rec {
# being generated to make sure that they use our glibc.
EXTRA_FLAGS="-I$NIX_FIXINC_DUMMY $(cat $NIX_CC/nix-support/libc-cflags) -O2"
extraLDFlags="-L$glibc_libdir -rpath $glibc_libdir $(cat $NIX_CC/nix-support/libc-ldflags) $(cat $NIX_CC/nix-support/libc-ldflags-before)"
extraLDFlags="-L$glibc_libdir -rpath $glibc_libdir"
extraLDFlags+=" $(cat $NIX_BINUTILS/nix-support/libc-ldflags)"
extraLDFlags+=" $(cat $NIX_BINUTILS/nix-support/libc-ldflags-before)"
for i in $extraLDFlags; do
EXTRA_FLAGS="$EXTRA_FLAGS -Wl,$i"
done

2
pkgs/development/libraries/oracle-instantclient/default.nix
View File

@ -67,7 +67,7 @@ in stdenv.mkDerivation rec {
done
for exe in $out/bin/sqlplus; do
patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
patchelf --set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) \
--force-rpath --set-rpath "$out/lib:${libaio}/lib" \
$exe
done

Some files were not shown because too many files have changed in this diff Show More