diff options
author | Shea Levy <shea@shealevy.com> | 2015-02-02 21:14:28 -0500 |
---|---|---|
committer | Shea Levy <shea@shealevy.com> | 2015-02-02 21:14:28 -0500 |
commit | c45372f038bc89c69390bdbc6a4b0bfdb63b1423 (patch) | |
tree | dc8ebe44d7a1ad0dc01b938199db38ebc14fbdfb /pkgs/applications/office | |
parent | acbf8eb5617bb601e81cdc783f941773032cf400 (diff) | |
parent | cfb29ab882323d379aba20a95020c7c24f883eae (diff) | |
download | nixlib-c45372f038bc89c69390bdbc6a4b0bfdb63b1423.tar nixlib-c45372f038bc89c69390bdbc6a4b0bfdb63b1423.tar.gz nixlib-c45372f038bc89c69390bdbc6a4b0bfdb63b1423.tar.bz2 nixlib-c45372f038bc89c69390bdbc6a4b0bfdb63b1423.tar.lz nixlib-c45372f038bc89c69390bdbc6a4b0bfdb63b1423.tar.xz nixlib-c45372f038bc89c69390bdbc6a4b0bfdb63b1423.tar.zst nixlib-c45372f038bc89c69390bdbc6a4b0bfdb63b1423.zip |
Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'
Partial staging merge, including cc-wrapper fixes Conflicts: pkgs/applications/audio/spotify/default.nix pkgs/build-support/cc-wrapper/default.nix pkgs/development/compilers/cryptol/1.8.x.nix
Diffstat (limited to 'pkgs/applications/office')
-rw-r--r-- | pkgs/applications/office/zotero/firefox-bin/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/office/zotero/firefox-bin/default.nix b/pkgs/applications/office/zotero/firefox-bin/default.nix index c9956497b109..0018f00a3662 100644 --- a/pkgs/applications/office/zotero/firefox-bin/default.nix +++ b/pkgs/applications/office/zotero/firefox-bin/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation { phases = "unpackPhase installPhase"; libPath = stdenv.lib.makeLibraryPath - [ stdenv.cc.gcc + [ stdenv.cc.cc alsaLib atk cairo @@ -106,7 +106,7 @@ stdenv.mkDerivation { pulseaudio systemd ] + ":" + stdenv.lib.makeSearchPath "lib64" [ - stdenv.cc.gcc + stdenv.cc.cc ]; # "strip" after "patchelf" may break binaries. |