diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-01-24 09:30:09 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-01-24 10:03:39 +0200 |
| commit | 619710268d1e0581f70d4d7c504b05e2d0b989a9 (patch) | |
| tree | 6df032b110dbea919e37a2cd178f93f14cebb830 | |
| parent | ba87da9fd12a7fce91fa08f32dc2ebb6933eac1c (diff) | |
| download | nixlib-619710268d1e0581f70d4d7c504b05e2d0b989a9.tar nixlib-619710268d1e0581f70d4d7c504b05e2d0b989a9.tar.gz nixlib-619710268d1e0581f70d4d7c504b05e2d0b989a9.tar.bz2 nixlib-619710268d1e0581f70d4d7c504b05e2d0b989a9.tar.lz nixlib-619710268d1e0581f70d4d7c504b05e2d0b989a9.tar.xz nixlib-619710268d1e0581f70d4d7c504b05e2d0b989a9.tar.zst nixlib-619710268d1e0581f70d4d7c504b05e2d0b989a9.zip | |
treewide: Mass replace 'poppler}/lib' to refer the 'out' output
| -rw-r--r-- | pkgs/applications/misc/pdfmod/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/typesetting/tex/texlive/aggregate.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/typesetting/tex/texlive/default.nix | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/misc/pdfmod/default.nix b/pkgs/applications/misc/pdfmod/default.nix index f23238b2dc61..12e3e696777d 100644 --- a/pkgs/applications/misc/pdfmod/default.nix +++ b/pkgs/applications/misc/pdfmod/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { --prefix LD_LIBRARY_PATH : ${gnome-sharp}/lib \ --prefix LD_LIBRARY_PATH : ${gtk-sharp.gtk}/lib \ --prefix LD_LIBRARY_PATH : ${gnome3.gconf}/lib \ - --prefix LD_LIBRARY_PATH : ${poppler}/lib + --prefix LD_LIBRARY_PATH : ${poppler.out}/lib ''; dontStrip = true; diff --git a/pkgs/tools/typesetting/tex/texlive/aggregate.nix b/pkgs/tools/typesetting/tex/texlive/aggregate.nix index 56b093f921d1..550870b0a6a9 100644 --- a/pkgs/tools/typesetting/tex/texlive/aggregate.nix +++ b/pkgs/tools/typesetting/tex/texlive/aggregate.nix @@ -66,7 +66,7 @@ rec { # did the same thing in texLive, but couldn't get it to carry to the # binaries installed by texLiveFull for prog in $out/bin/*; do - wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${poppler}/lib" + wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${poppler.out}/lib" done '' ) [ "minInit" "defEnsureDir" "addInputs" ]; diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index 008de2d25209..48a5ae8d6499 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -30,7 +30,7 @@ rec { setupHook = ./setup-hook.sh; doMainBuild = fullDepEntry ( stdenv.lib.optionalString stdenv.isDarwin '' - export DYLD_LIBRARY_PATH="${poppler}/lib" + export DYLD_LIBRARY_PATH="${poppler.out}/lib" '' + '' mkdir -p $out mkdir -p $out/nix-support @@ -106,7 +106,7 @@ rec { PATH=$PATH:$out/bin mktexlsr $out/share/texmf* '' + stdenv.lib.optionalString stdenv.isDarwin '' for prog in $out/bin/*; do - wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${poppler}/lib" + wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${poppler.out}/lib" done '' ) [ "minInit" "defEnsureDir" "doUnpack" "doMakeInstall" "promoteLibexec" "patchShebangsInterim"]; |