diff options
Diffstat (limited to 'pkgs/development')
28 files changed, 38 insertions, 39 deletions
diff --git a/pkgs/development/compilers/cryptol/1.8.x.nix b/pkgs/development/compilers/cryptol/1.8.x.nix index e6f04249f53a..b9a92d9a96fd 100644 --- a/pkgs/development/compilers/cryptol/1.8.x.nix +++ b/pkgs/development/compilers/cryptol/1.8.x.nix @@ -11,11 +11,11 @@ let libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.libc - stdenv.cc.gcc + stdenv.cc.cc gmp4 ncurses zlib - ] + ":${stdenv.cc.gcc}/lib64"; + ] + ":${stdenv.cc.cc}/lib64"; cryptol-bin = if stdenv.system == "i686-linux" diff --git a/pkgs/development/compilers/cudatoolkit/5.5.nix b/pkgs/development/compilers/cudatoolkit/5.5.nix index a16a252b4a56..e1d8ab13a513 100644 --- a/pkgs/development/compilers/cudatoolkit/5.5.nix +++ b/pkgs/development/compilers/cudatoolkit/5.5.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { gtk2 glib fontconfig freetype unixODBC alsaLib ]; - rpath = "${stdenv.lib.makeLibraryPath runtimeDependencies}:${stdenv.cc.gcc}/lib64"; + rpath = "${stdenv.lib.makeLibraryPath runtimeDependencies}:${stdenv.cc.cc}/lib64"; unpackPhase = '' sh $src --keep --noexec diff --git a/pkgs/development/compilers/cudatoolkit/6.0.nix b/pkgs/development/compilers/cudatoolkit/6.0.nix index d6fdb6c6bdb0..f8b4506ee426 100644 --- a/pkgs/development/compilers/cudatoolkit/6.0.nix +++ b/pkgs/development/compilers/cudatoolkit/6.0.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { gtk2 glib fontconfig freetype unixODBC alsaLib ]; - rpath = "${stdenv.lib.makeLibraryPath runtimeDependencies}:${stdenv.cc.gcc}/lib64"; + rpath = "${stdenv.lib.makeLibraryPath runtimeDependencies}:${stdenv.cc.cc}/lib64"; unpackPhase = '' sh $src --keep --noexec diff --git a/pkgs/development/compilers/gcl/default.nix b/pkgs/development/compilers/gcl/default.nix index 452f5c09bf5c..a31517afbeb1 100644 --- a/pkgs/development/compilers/gcl/default.nix +++ b/pkgs/development/compilers/gcl/default.nix @@ -10,9 +10,8 @@ in ( assert a.stdenv ? cc ; -assert a.stdenv.cc ? gcc ; +assert a.stdenv.cc.cc.isGNU or false ; assert a.stdenv.cc ? libc ; -assert a.stdenv.cc.gcc != null ; assert a.stdenv.cc.libc != null ; rec { @@ -37,7 +36,7 @@ rec { preBuild = a.fullDepEntry ('' sed -re "s@/bin/cat@$(which cat)@g" -i configure */configure sed -re "s@if test -d /proc/self @if false @" -i configure - sed -re 's^([ \t])cpp ^\1cpp -I${a.stdenv.cc.gcc}/include -I${a.stdenv.cc.libc}/include ^g' -i makefile + sed -re 's^([ \t])cpp ^\1cpp -I${a.stdenv.cc.cc}/include -I${a.stdenv.cc.libc}/include ^g' -i makefile '') ["minInit" "doUnpack" "addInputs"]; /* doConfigure should be removed if not needed */ diff --git a/pkgs/development/compilers/julia/0.2.1.nix b/pkgs/development/compilers/julia/0.2.1.nix index 78407f6b6c64..cc1be3db8a5b 100644 --- a/pkgs/development/compilers/julia/0.2.1.nix +++ b/pkgs/development/compilers/julia/0.2.1.nix @@ -4,7 +4,7 @@ , tcl, tk, xproto, libX11, git, mpfr } : let - realGcc = stdenv.cc.gcc; + realGcc = stdenv.cc.cc; in stdenv.mkDerivation rec { pname = "julia"; diff --git a/pkgs/development/compilers/julia/0.3.5.nix b/pkgs/development/compilers/julia/0.3.5.nix index 36639bd0e5ee..62fe9844c695 100644 --- a/pkgs/development/compilers/julia/0.3.5.nix +++ b/pkgs/development/compilers/julia/0.3.5.nix @@ -7,7 +7,7 @@ assert stdenv.isLinux; let - realGcc = stdenv.cc.gcc; + realGcc = stdenv.cc.cc; in stdenv.mkDerivation rec { pname = "julia"; diff --git a/pkgs/development/compilers/llvm/3.3/clang.nix b/pkgs/development/compilers/llvm/3.3/clang.nix index 3282542ba3c2..aeaa476df12b 100644 --- a/pkgs/development/compilers/llvm/3.3/clang.nix +++ b/pkgs/development/compilers/llvm/3.3/clang.nix @@ -2,7 +2,7 @@ let version = "3.3"; - gccReal = if (stdenv.cc.gcc or null) == null then stdenv.cc else stdenv.cc.gcc; + gccReal = if (stdenv.cc.cc or null) == null then stdenv.cc else stdenv.cc.cc; in stdenv.mkDerivation { @@ -29,7 +29,7 @@ stdenv.mkDerivation { sha256 = "15mrvw43s4frk1j49qr4v5viq68h8qlf10qs6ghd6mrsmgj5vddi"; }; - passthru = { gcc = stdenv.cc.gcc; }; + passthru = { cc = stdenv.cc.cc; }; meta = { homepage = http://clang.llvm.org/; diff --git a/pkgs/development/compilers/llvm/3.4/clang.nix b/pkgs/development/compilers/llvm/3.4/clang.nix index a2358a6f0b77..612e63eafd49 100644 --- a/pkgs/development/compilers/llvm/3.4/clang.nix +++ b/pkgs/development/compilers/llvm/3.4/clang.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { "-DCLANG_PATH_TO_LLVM_BUILD=${llvm}" ] ++ (stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.cc.libc}/include") ++ - (stdenv.lib.optional (stdenv.cc.gcc != null) "-DGCC_INSTALL_PREFIX=${stdenv.cc.gcc}"); + (stdenv.lib.optional (stdenv.cc.cc != null) "-DGCC_INSTALL_PREFIX=${stdenv.cc.cc}"); # Clang expects to find LLVMgold in its own prefix # Clang expects to find sanitizer libraries in its own prefix @@ -34,7 +34,7 @@ stdenv.mkDerivation { ln -sv ${llvm}/lib/clang/${version}/lib $out/lib/clang/${version}/ ''; - passthru.gcc = stdenv.cc.gcc; + passthru.cc = stdenv.cc.cc; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/mozart/binary.nix b/pkgs/development/compilers/mozart/binary.nix index 9868e8d92c35..a420ef9c292c 100644 --- a/pkgs/development/compilers/mozart/binary.nix +++ b/pkgs/development/compilers/mozart/binary.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { }; libPath = stdenv.lib.makeLibraryPath - [stdenv.cc.gcc emacs tk tcl boost gmp]; + [stdenv.cc.cc emacs tk tcl boost gmp]; builder = ./builder.sh; diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix index f51107a2b29e..35ee1a04a268 100644 --- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix +++ b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix @@ -174,7 +174,7 @@ let result = stdenv.mkDerivation rec { */ libraries = [stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt mesa_noglu xlibs.libXxf86vm alsaLib fontconfig freetype gnome.pango gnome.gtk cairo gdk_pixbuf atk] ++ - (if swingSupport then [xlibs.libX11 xlibs.libXext xlibs.libXtst xlibs.libXi xlibs.libXp xlibs.libXt xlibs.libXrender stdenv.cc.gcc] else []); + (if swingSupport then [xlibs.libX11 xlibs.libXext xlibs.libXtst xlibs.libXi xlibs.libXp xlibs.libXt xlibs.libXrender stdenv.cc.cc] else []); passthru.mozillaPlugin = if installjdk then "/jre/lib/${architecture}/plugins" else "/lib/${architecture}/plugins"; diff --git a/pkgs/development/compilers/rustc/0.12.nix b/pkgs/development/compilers/rustc/0.12.nix index 9cbe3fec2c40..dda9be1f1285 100644 --- a/pkgs/development/compilers/rustc/0.12.nix +++ b/pkgs/development/compilers/rustc/0.12.nix @@ -54,7 +54,7 @@ in stdenv.mkDerivation { cp -r bin "$out/bin" '' + (if stdenv.isLinux then '' patchelf --interpreter "${stdenv.glibc}/lib/${stdenv.cc.dynamicLinker}" \ - --set-rpath "${stdenv.cc.gcc}/lib/:${stdenv.cc.gcc}/lib64/" \ + --set-rpath "${stdenv.cc.cc}/lib/:${stdenv.cc.cc}/lib64/" \ "$out/bin/rustc" '' else ""); }; diff --git a/pkgs/development/compilers/rustc/head.nix b/pkgs/development/compilers/rustc/head.nix index 5aad9bfa5fff..760fcdd851a6 100644 --- a/pkgs/development/compilers/rustc/head.nix +++ b/pkgs/development/compilers/rustc/head.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation { cp -r bin "$out/bin" '' + (if stdenv.isLinux then '' patchelf --interpreter "${stdenv.glibc}/lib/${stdenv.cc.dynamicLinker}" \ - --set-rpath "${stdenv.cc.gcc}/lib/:${stdenv.cc.gcc}/lib64/" \ + --set-rpath "${stdenv.cc.cc}/lib/:${stdenv.cc.cc}/lib64/" \ "$out/bin/rustc" '' else ""); }; diff --git a/pkgs/development/guile-modules/guile-lib/default.nix b/pkgs/development/guile-modules/guile-lib/default.nix index 258fe1e497e3..10d98dbf7c3d 100644 --- a/pkgs/development/guile-modules/guile-lib/default.nix +++ b/pkgs/development/guile-modules/guile-lib/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, guile, texinfo}: -assert stdenv ? cc && stdenv.cc ? gcc && stdenv.cc.gcc != null; +assert stdenv ? cc && stdenv.cc.cc.isGNU or false; stdenv.mkDerivation rec { name = "guile-lib-0.2.2"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { preCheck = # Make `libgcc_s.so' visible for `pthread_cancel'. - '' export LD_LIBRARY_PATH="$(dirname $(echo ${stdenv.cc.gcc}/lib*/libgcc_s.so)):$LD_LIBRARY_PATH" + '' export LD_LIBRARY_PATH="$(dirname $(echo ${stdenv.cc.cc}/lib*/libgcc_s.so)):$LD_LIBRARY_PATH" ''; meta = { diff --git a/pkgs/development/interpreters/dart/default.nix b/pkgs/development/interpreters/dart/default.nix index f51ac1cdddf1..dd0d0e94482c 100644 --- a/pkgs/development/interpreters/dart/default.nix +++ b/pkgs/development/interpreters/dart/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { sha256 = "00935c4vxfj2h3x354g75qdazswwissbwc7kj5k05l1m3lizikf6"; }; - libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.gcc ]; + libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]; dontStrip = true; -} \ No newline at end of file +} diff --git a/pkgs/development/libraries/fmod/default.nix b/pkgs/development/libraries/fmod/default.nix index 5473f2eb9b6a..f014c4cecb6a 100644 --- a/pkgs/development/libraries/fmod/default.nix +++ b/pkgs/development/libraries/fmod/default.nix @@ -5,7 +5,7 @@ let bits = stdenv.lib.optionalString (stdenv.system == "x86_64-linux") "64"; libPath = stdenv.lib.makeLibraryPath - [ stdenv.cc.libc stdenv.cc.gcc ] + ":${stdenv.cc.gcc}/lib64"; + [ stdenv.cc.libc stdenv.cc.cc ] + ":${stdenv.cc.cc}/lib64"; patchLib = x: "patchelf --set-rpath ${libPath} ${x}"; in stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 2868e1de4f7e..714b8073ee04 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -7,7 +7,7 @@ with stdenv.lib; -assert !stdenv.isDarwin -> stdenv.cc ? gcc; +assert !stdenv.isDarwin -> stdenv.cc.cc.isGNU or false; # TODO: # * Add gio-module-fam diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix index dcd7acf9b854..b6aad5782045 100644 --- a/pkgs/development/libraries/glibc/default.nix +++ b/pkgs/development/libraries/glibc/default.nix @@ -33,9 +33,9 @@ in # libgcc_s will not be at {gcc}/lib, and gcc's libgcc will be found without # any special hack. preInstall = '' - if [ -f ${stdenv.cc.gcc}/lib/libgcc_s.so.1 ]; then + if [ -f ${stdenv.cc.cc}/lib/libgcc_s.so.1 ]; then mkdir -p $out/lib - cp ${stdenv.cc.gcc}/lib/libgcc_s.so.1 $out/lib/libgcc_s.so.1 + cp ${stdenv.cc.cc}/lib/libgcc_s.so.1 $out/lib/libgcc_s.so.1 fi ''; diff --git a/pkgs/development/libraries/libre/default.nix b/pkgs/development/libraries/libre/default.nix index 4e007c1b2efb..4a8e68da0b81 100644 --- a/pkgs/development/libraries/libre/default.nix +++ b/pkgs/development/libraries/libre/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { "USE_ZLIB=1" "USE_OPENSSL=1" ''PREFIX=$(out)'' ] - ++ stdenv.lib.optional (stdenv.cc.gcc != null) "SYSROOT_ALT=${stdenv.cc.gcc}" + ++ stdenv.lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.cc.cc}" ++ stdenv.lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.cc.libc}" ; meta = { diff --git a/pkgs/development/libraries/librem/default.nix b/pkgs/development/libraries/librem/default.nix index b28a8cfd9a98..165e16a88238 100644 --- a/pkgs/development/libraries/librem/default.nix +++ b/pkgs/development/libraries/librem/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { "LIBRE_INC=${libre}/include/re" ''PREFIX=$(out)'' ] - ++ stdenv.lib.optional (stdenv.cc.gcc != null) "SYSROOT_ALT=${stdenv.cc.gcc}" + ++ stdenv.lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.cc.cc}" ++ stdenv.lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.cc.libc}" ; meta = { diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index 86dbcd1ec567..7eded3e4c5f2 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -57,8 +57,8 @@ stdenv.mkDerivation rec { ''; postFixup = if stdenv.isDarwin then '' - install_name_tool -change /usr/local/lib/libv8.dylib $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.gcc}/lib/libgcc_s.1.dylib $out/bin/d8 - install_name_tool -id $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.gcc}/lib/libgcc_s.1.dylib $out/lib/libv8.dylib + install_name_tool -change /usr/local/lib/libv8.dylib $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc}/lib/libgcc_s.1.dylib $out/bin/d8 + install_name_tool -id $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc}/lib/libgcc_s.1.dylib $out/lib/libv8.dylib '' else null; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/wtk/default.nix b/pkgs/development/libraries/wtk/default.nix index 8544513e5809..bde3f6e4efb9 100644 --- a/pkgs/development/libraries/wtk/default.nix +++ b/pkgs/development/libraries/wtk/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ unzip ]; - libraries = [ xlibs.libXpm xlibs.libXt xlibs.libX11 xlibs.libICE xlibs.libSM stdenv.cc.gcc ]; + libraries = [ xlibs.libXpm xlibs.libXt xlibs.libX11 xlibs.libICE xlibs.libSM stdenv.cc.cc ]; meta = { homepage = http://java.sun.com/products/sjwtoolkit/download.html; diff --git a/pkgs/development/misc/amdapp-sdk/default.nix b/pkgs/development/misc/amdapp-sdk/default.nix index 02cf9b03bd77..81b40bc78ac6 100644 --- a/pkgs/development/misc/amdapp-sdk/default.nix +++ b/pkgs/development/misc/amdapp-sdk/default.nix @@ -87,7 +87,7 @@ in stdenv.mkDerivation rec { # Create wrappers patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/bin/clinfo - patchelf --set-rpath ${stdenv.cc.gcc}/lib64:${stdenv.cc.gcc}/lib $out/bin/clinfo + patchelf --set-rpath ${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/lib $out/bin/clinfo # Fix modes find "$out/" -type f -exec chmod 644 {} \; diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix index 1e0df06de27f..c969ca14332b 100644 --- a/pkgs/development/mobile/androidenv/androidsdk.nix +++ b/pkgs/development/mobile/androidenv/androidsdk.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { for i in emulator64-arm emulator64-mips emulator64-x86 do patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 $i - patchelf --set-rpath ${stdenv.cc.gcc}/lib64 $i + patchelf --set-rpath ${stdenv.cc.cc}/lib64 $i done ''} @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { patchelf --set-rpath ${libX11}/lib:${libXext}/lib:${libXrender}/lib:${freetype}/lib:${fontconfig}/lib libcairo-swt.so wrapProgram `pwd`/monitor \ - --prefix LD_LIBRARY_PATH : ${gtk}/lib:${atk}/lib:${stdenv.cc.gcc}/lib + --prefix LD_LIBRARY_PATH : ${gtk}/lib:${atk}/lib:${stdenv.cc.cc}/lib cd ../.. '' @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { patchelf --set-rpath ${libX11}/lib:${libXext}/lib:${libXrender}/lib:${freetype}/lib:${fontconfig}/lib libcairo-swt.so wrapProgram `pwd`/monitor \ - --prefix LD_LIBRARY_PATH : ${gtk}/lib:${atk}/lib:${stdenv.cc.gcc}/lib + --prefix LD_LIBRARY_PATH : ${gtk}/lib:${atk}/lib:${stdenv.cc.cc}/lib cd ../.. '' diff --git a/pkgs/development/tools/atom-shell/default.nix b/pkgs/development/tools/atom-shell/default.nix index 872fc43a2571..983c5c451d0a 100644 --- a/pkgs/development/tools/atom-shell/default.nix +++ b/pkgs/development/tools/atom-shell/default.nix @@ -6,7 +6,7 @@ let atomEnv = buildEnv { name = "env-atom"; paths = [ - stdenv.cc.gcc zlib glib dbus gtk atk pango freetype libgnome_keyring3 + stdenv.cc.cc zlib glib dbus gtk atk pango freetype libgnome_keyring3 fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss xlibs.libXrender xlibs.libX11 xlibs.libXext xlibs.libXdamage xlibs.libXtst xlibs.libXcomposite xlibs.libXi xlibs.libXfixes xlibs.libXrandr diff --git a/pkgs/development/tools/build-managers/cargo/snapshot.nix b/pkgs/development/tools/build-managers/cargo/snapshot.nix index b873aee62f9e..f7475a70e7f2 100644 --- a/pkgs/development/tools/build-managers/cargo/snapshot.nix +++ b/pkgs/development/tools/build-managers/cargo/snapshot.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { cp -r bin "$out/bin" '' + (if stdenv.isLinux then '' patchelf --interpreter "${stdenv.glibc}/lib/${stdenv.cc.dynamicLinker}" \ - --set-rpath "${stdenv.cc.gcc}/lib/:${stdenv.cc.gcc}/lib64/:${zlib}/lib" \ + --set-rpath "${stdenv.cc.cc}/lib/:${stdenv.cc.cc}/lib64/:${zlib}/lib" \ "$out/bin/cargo" '' else ""); } diff --git a/pkgs/development/tools/misc/saleae-logic/default.nix b/pkgs/development/tools/misc/saleae-logic/default.nix index 1e8d11fe622b..8e8909ee7d07 100644 --- a/pkgs/development/tools/misc/saleae-logic/default.nix +++ b/pkgs/development/tools/misc/saleae-logic/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { # Patch it patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/Logic" - patchelf --set-rpath "${stdenv.cc.gcc}/lib:${stdenv.cc.gcc}/lib64:${libPath}:\$ORIGIN/Analyzers:\$ORIGIN" "$out/Logic" + patchelf --set-rpath "${stdenv.cc.cc}/lib:${stdenv.cc.cc}/lib64:${libPath}:\$ORIGIN/Analyzers:\$ORIGIN" "$out/Logic" # Build the LD_PRELOAD library that makes Logic work from a read-only directory mkdir -p "$out/lib" diff --git a/pkgs/development/tools/node-webkit/default.nix b/pkgs/development/tools/node-webkit/default.nix index 7c7e7c8eb28d..97399e5268ce 100644 --- a/pkgs/development/tools/node-webkit/default.nix +++ b/pkgs/development/tools/node-webkit/default.nix @@ -10,7 +10,7 @@ let paths = [ xlibs.libX11 xlibs.libXrender glib gtk atk pango cairo gdk_pixbuf freetype fontconfig xlibs.libXcomposite alsaLib xlibs.libXdamage - xlibs.libXext xlibs.libXfixes nss nspr gconf expat dbus stdenv.cc.gcc + xlibs.libXext xlibs.libXfixes nss nspr gconf expat dbus stdenv.cc.cc xlibs.libXtst xlibs.libXi ]; }; diff --git a/pkgs/development/tools/phantomjs/default.nix b/pkgs/development/tools/phantomjs/default.nix index f6acfab73830..77bc1e5a885f 100644 --- a/pkgs/development/tools/phantomjs/default.nix +++ b/pkgs/development/tools/phantomjs/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { buildPhase = if stdenv.isDarwin then "" else '' patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${freetype}/lib:${fontconfig}/lib:${stdenv.cc.gcc}/lib64:${stdenv.cc.gcc}/lib:${openssl}/lib" \ + --set-rpath "${freetype}/lib:${fontconfig}/lib:${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/lib:${openssl}/lib" \ bin/phantomjs ''; |