diff options
author | Nikolay Amiantov <ab@fmap.me> | 2016-04-25 18:02:23 +0300 |
---|---|---|
committer | Nikolay Amiantov <ab@fmap.me> | 2016-04-25 18:02:23 +0300 |
commit | 5f19542581ed03b5059ffb78113b99f190cc6b29 (patch) | |
tree | db584519d534b555ee7629efa2b3ec19d4b01f58 /pkgs/applications | |
parent | 09f02b918ec4df875326e3addcdb99343c976a78 (diff) | |
parent | 69a072484dd9ee04c68a3bf3ce5a1bdb111a9229 (diff) | |
download | nixpkgs-5f19542581ed03b5059ffb78113b99f190cc6b29.tar nixpkgs-5f19542581ed03b5059ffb78113b99f190cc6b29.tar.gz nixpkgs-5f19542581ed03b5059ffb78113b99f190cc6b29.tar.bz2 nixpkgs-5f19542581ed03b5059ffb78113b99f190cc6b29.tar.lz nixpkgs-5f19542581ed03b5059ffb78113b99f190cc6b29.tar.xz nixpkgs-5f19542581ed03b5059ffb78113b99f190cc6b29.tar.zst nixpkgs-5f19542581ed03b5059ffb78113b99f190cc6b29.zip |
Merge commit 'refs/pull/14694/head' of git://github.com/NixOS/nixpkgs into staging
Diffstat (limited to 'pkgs/applications')
13 files changed, 34 insertions, 34 deletions
diff --git a/pkgs/applications/editors/atom/env.nix b/pkgs/applications/editors/atom/env.nix index d91d8a4ecbe..dbfc2ebb6b3 100644 --- a/pkgs/applications/editors/atom/env.nix +++ b/pkgs/applications/editors/atom/env.nix @@ -13,7 +13,7 @@ let ]; libPathNative = lib.makeLibraryPath packages; - libPath64 = lib.makeSearchPathOutputs "lib64" ["lib"] packages; + libPath64 = lib.makeSearchPathOutput "lib" "lib64" packages; libPath = "${libPathNative}:${libPath64}"; in { inherit packages libPath; } diff --git a/pkgs/applications/misc/guake/default.nix b/pkgs/applications/misc/guake/default.nix index 81ac845c5cf..6290f082734 100644 --- a/pkgs/applications/misc/guake/default.nix +++ b/pkgs/applications/misc/guake/default.nix @@ -16,7 +16,7 @@ gconftool-2 --recursive-unset /apps/guake with lib; let inputs = [ dbus gtk2 gconf python2 libutempter vte keybinder gnome3.gnome_common ]; - pyPath = makeSearchPathOutputs python2.sitePackages ["lib"] (attrVals [ "dbus" "notify" "pyGtkGlade" "pyxdg" ] python2Packages ++ [ gnome2.gnome_python ]); + pyPath = makeSearchPathOutput "lib" python2.sitePackages (attrVals [ "dbus" "notify" "pyGtkGlade" "pyxdg" ] python2Packages ++ [ gnome2.gnome_python ]); in stdenv.mkDerivation rec { name = "guake-${version}"; version = "0.8.3"; diff --git a/pkgs/applications/misc/roxterm/default.nix b/pkgs/applications/misc/roxterm/default.nix index ec055f3055f..d8f44ba5cdb 100644 --- a/pkgs/applications/misc/roxterm/default.nix +++ b/pkgs/applications/misc/roxterm/default.nix @@ -29,7 +29,7 @@ in stdenv.mkDerivation rec { "-I${dbus_libs.lib}/lib/dbus-1.0/include" ]; # Fix up python path so the lockfile library is on it. - PYTHONPATH = stdenv.lib.makeSearchPathOutputs pythonFull.sitePackages ["lib"] [ + PYTHONPATH = stdenv.lib.makeSearchPathOutput "lib" pythonFull.sitePackages [ pythonPackages.curses pythonPackages.lockfile ]; diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index b7883454b34..ac7f8111212 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -65,7 +65,7 @@ let patchPhase = let rpaths = [ stdenv.cc.cc ]; - mkrpath = p: "${makeSearchPathOutputs "lib64" ["lib"] p}:${makeLibraryPath p}"; + mkrpath = p: "${makeSearchPathOutput "lib" "lib64" p}:${makeLibraryPath p}"; in '' for sofile in PepperFlash/libpepflashplayer.so \ libwidevinecdm.so libwidevinecdmadapter.so; do diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 152089286b4..d07aec33eb0 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -105,7 +105,7 @@ stdenv.mkDerivation { libheimdal libpulseaudio systemd - ] + ":" + stdenv.lib.makeSearchPathOutputs "lib64" ["lib"] [ + ] + ":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" [ stdenv.cc.cc ]; diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index 77f0d1693da..3042f30e000 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -65,7 +65,7 @@ in stdenv.mkDerivation rec { tar xf data.tar.xz ''; - rpath = makeLibraryPath deps + ":" + makeSearchPathOutputs "lib64" ["lib"] deps; + rpath = makeLibraryPath deps + ":" + makeSearchPathOutput "lib" "lib64" deps; binpath = makeBinPath deps; installPhase = '' diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index 325e855ec72..a00905cf937 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { libPath = stdenv.lib.makeLibraryPath buildInputs + stdenv.lib.optionalString (stdenv.system == "x86_64-linux") - (":" + stdenv.lib.makeSearchPathOutputs "lib64" ["lib"] buildInputs); + (":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" buildInputs); preFixup = '' diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 7c3c167cf32..c8931811548 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { libPath = stdenv.lib.makeLibraryPath buildInputs + stdenv.lib.optionalString (stdenv.system == "x86_64-linux") - (":" + stdenv.lib.makeSearchPathOutputs "lib64" ["lib"] buildInputs); + (":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" buildInputs); buildPhase = '' echo "Patching Vivaldi binaries" diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index bbb51c7c186..f974265aa6e 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -105,7 +105,7 @@ stdenv.mkDerivation { nspr nss pango - ] + ":" + stdenv.lib.makeSearchPathOutputs "lib64" ["lib"] [ + ] + ":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" [ stdenv.cc.cc ]; diff --git a/pkgs/applications/science/math/mathematica/9.nix b/pkgs/applications/science/math/mathematica/9.nix index 2a43cf5677f..07a20b4ebe0 100644 --- a/pkgs/applications/science/math/mathematica/9.nix +++ b/pkgs/applications/science/math/mathematica/9.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { ldpath = stdenv.lib.makeLibraryPath buildInputs + stdenv.lib.optionalString (stdenv.system == "x86_64-linux") - (":" + stdenv.lib.makeSearchPathOutputs "lib64" ["lib"] buildInputs); + (":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" buildInputs); phases = "unpackPhase installPhase fixupPhase"; diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix index c2988331c4c..4de4a0c261d 100644 --- a/pkgs/applications/science/math/mathematica/default.nix +++ b/pkgs/applications/science/math/mathematica/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { ldpath = stdenv.lib.makeLibraryPath buildInputs + stdenv.lib.optionalString (stdenv.system == "x86_64-linux") - (":" + stdenv.lib.makeSearchPathOutputs "lib64" ["lib"] buildInputs); + (":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" buildInputs); phases = "unpackPhase installPhase fixupPhase"; diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix index 253b97aff1e..345b1341c0f 100644 --- a/pkgs/applications/search/recoll/default.nix +++ b/pkgs/applications/search/recoll/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bison +{ stdenv, fetchurl, lib, bison , qt4, xapian, file, python, perl , djvulibre, groff, libxslt, unzip, poppler_utils, antiword, catdoc, lyx , libwpd, unrtf, untex @@ -26,27 +26,27 @@ stdenv.mkDerivation rec { # the absolute path to the filtering command. postInstall = '' for f in $out/share/recoll/filters/* ; do - substituteInPlace $f --replace antiword ${antiword}/bin/antiword - substituteInPlace $f --replace awk ${gawk}/bin/awk - substituteInPlace $f --replace catppt ${catdoc}/bin/catppt - substituteInPlace $f --replace djvused ${djvulibre.bin}/bin/djvused - substituteInPlace $f --replace djvutxt ${djvulibre.bin}/bin/djvutxt - substituteInPlace $f --replace egrep ${gnugrep}/bin/egrep - substituteInPlace $f --replace groff ${groff}/bin/groff - substituteInPlace $f --replace gunzip ${gzip}/bin/gunzip - substituteInPlace $f --replace iconv ${libiconv.bin or libiconv}/bin/iconv - substituteInPlace $f --replace lyx ${lyx}/bin/lyx - substituteInPlace $f --replace pdftotext ${poppler_utils.out}/bin/pdftotext - substituteInPlace $f --replace pstotext ${ghostscript}/bin/ps2ascii - substituteInPlace $f --replace sed ${gnused}/bin/sed - substituteInPlace $f --replace tar ${gnutar}/bin/tar - substituteInPlace $f --replace unzip ${unzip}/bin/unzip - substituteInPlace $f --replace xls2csv ${catdoc}/bin/xls2csv - substituteInPlace $f --replace xsltproc ${libxslt.bin}/bin/xsltproc - substituteInPlace $f --replace unrtf ${unrtf}/bin/unrtf - substituteInPlace $f --replace untex ${untex}/bin/untex - substituteInPlace $f --replace wpd2html ${libwpd}/bin/wpd2html - substituteInPlace $f --replace /usr/bin/perl ${perl}/bin/perl + substituteInPlace $f --replace antiword ${lib.getBin antiword}/bin/antiword + substituteInPlace $f --replace awk ${lib.getBin gawk}/bin/awk + substituteInPlace $f --replace catppt ${lib.getBin catdoc}/bin/catppt + substituteInPlace $f --replace djvused ${lib.getBin djvulibre}/bin/djvused + substituteInPlace $f --replace djvutxt ${lib.getBin djvulibre}/bin/djvutxt + substituteInPlace $f --replace egrep ${lib.getBin gnugrep}/bin/egrep + substituteInPlace $f --replace groff ${lib.getBin groff}/bin/groff + substituteInPlace $f --replace gunzip ${lib.getBin gzip}/bin/gunzip + substituteInPlace $f --replace iconv ${lib.getBin libiconv}/bin/iconv + substituteInPlace $f --replace lyx ${lib.getBin lyx}/bin/lyx + substituteInPlace $f --replace pdftotext ${lib.getBin poppler_utils}/bin/pdftotext + substituteInPlace $f --replace pstotext ${lib.getBin ghostscript}/bin/ps2ascii + substituteInPlace $f --replace sed ${lib.getBin gnused}/bin/sed + substituteInPlace $f --replace tar ${lib.getBin gnutar}/bin/tar + substituteInPlace $f --replace unzip ${lib.getBin unzip}/bin/unzip + substituteInPlace $f --replace xls2csv ${lib.getBin catdoc}/bin/xls2csv + substituteInPlace $f --replace xsltproc ${lib.getBin libxslt}/bin/xsltproc + substituteInPlace $f --replace unrtf ${lib.getBin unrtf}/bin/unrtf + substituteInPlace $f --replace untex ${lib.getBin untex}/bin/untex + substituteInPlace $f --replace wpd2html ${lib.getBin libwpd}/bin/wpd2html + substituteInPlace $f --replace /usr/bin/perl ${lib.getBin perl}/bin/perl done ''; diff --git a/pkgs/applications/version-management/reposurgeon/default.nix b/pkgs/applications/version-management/reposurgeon/default.nix index 669151adbcc..55858034b1c 100644 --- a/pkgs/applications/version-management/reposurgeon/default.nix +++ b/pkgs/applications/version-management/reposurgeon/default.nix @@ -51,7 +51,7 @@ mkDerivation rec { [ out git bazaar cvs darcs fossil mercurial monotone rcs src subversion cvs_fast_export ] ); - pythonpath = makeSearchPathOutputs python27.sitePackages ["lib"] ( + pythonpath = makeSearchPathOutput "lib" python27.sitePackages ( filter (x: x != null) [ python27Packages.readline or null python27Packages.hglib or null ] ); |