diff options
author | Nikolay Amiantov <ab@fmap.me> | 2016-04-30 23:56:43 +0300 |
---|---|---|
committer | Nikolay Amiantov <ab@fmap.me> | 2016-05-01 00:13:23 +0300 |
commit | 87ebab128a466b6b3ac60711621ba6264cb7075a (patch) | |
tree | 1053a6f00009931dafa4d781298b27d26fb8ae53 /pkgs/tools/misc | |
parent | 3994a236bb004b8244ead60f0085a657121ed956 (diff) | |
download | nixlib-87ebab128a466b6b3ac60711621ba6264cb7075a.tar nixlib-87ebab128a466b6b3ac60711621ba6264cb7075a.tar.gz nixlib-87ebab128a466b6b3ac60711621ba6264cb7075a.tar.bz2 nixlib-87ebab128a466b6b3ac60711621ba6264cb7075a.tar.lz nixlib-87ebab128a466b6b3ac60711621ba6264cb7075a.tar.xz nixlib-87ebab128a466b6b3ac60711621ba6264cb7075a.tar.zst nixlib-87ebab128a466b6b3ac60711621ba6264cb7075a.zip |
replace ${stdenv.cc.cc}/lib occurences
Diffstat (limited to 'pkgs/tools/misc')
-rw-r--r-- | pkgs/tools/misc/megacli/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/misc/staruml/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/misc/megacli/default.nix b/pkgs/tools/misc/megacli/default.nix index 1f57b290cdd7..cbebd557d77c 100644 --- a/pkgs/tools/misc/megacli/default.nix +++ b/pkgs/tools/misc/megacli/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { cd $out unzip ${src} rpmextract linux/MegaCli-8.07.07-1.noarch.rpm - ${patchelf}/bin/patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath ${libPath}:$out/opt/lsi/3rdpartylibs/x86_64:$out/opt/lsi/3rdpartylibs:${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/lib opt/MegaRAID/MegaCli/MegaCli64 + ${patchelf}/bin/patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath ${libPath}:$out/opt/lsi/3rdpartylibs/x86_64:$out/opt/lsi/3rdpartylibs:${stdenv.cc.cc.lib}/lib64:${stdenv.cc.cc.lib}/lib opt/MegaRAID/MegaCli/MegaCli64 wrapProgram $out/opt/MegaRAID/MegaCli/MegaCli64 --set LD_LIBRARY_PATH $out/opt/lsi/3rdpartylibs/x86_64 ln -s $out/opt/MegaRAID/MegaCli/MegaCli64 $out/bin/MegaCli64 eval fixupPhase diff --git a/pkgs/tools/misc/staruml/default.nix b/pkgs/tools/misc/staruml/default.nix index 0d2982c022f9..90771b0527c8 100644 --- a/pkgs/tools/misc/staruml/default.nix +++ b/pkgs/tools/misc/staruml/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { mkdir -p $out/lib - ln -s ${stdenv.cc.cc}/lib/libstdc++.so.6 $out/lib/ + ln -s ${stdenv.cc.cc.lib}/lib/libstdc++.so.6 $out/lib/ ln -s ${libudev.out}/lib/libudev.so.1 $out/lib/libudev.so.0 wrapProgram $out/bin/StarUML \ |