mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-28 01:43:15 +00:00
treewide: Mass replace 'poppler}/lib' to refer the 'out' output
This commit is contained in:
parent
ba87da9fd1
commit
619710268d
@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
|
|||||||
--prefix LD_LIBRARY_PATH : ${gnome-sharp}/lib \
|
--prefix LD_LIBRARY_PATH : ${gnome-sharp}/lib \
|
||||||
--prefix LD_LIBRARY_PATH : ${gtk-sharp.gtk}/lib \
|
--prefix LD_LIBRARY_PATH : ${gtk-sharp.gtk}/lib \
|
||||||
--prefix LD_LIBRARY_PATH : ${gnome3.gconf}/lib \
|
--prefix LD_LIBRARY_PATH : ${gnome3.gconf}/lib \
|
||||||
--prefix LD_LIBRARY_PATH : ${poppler}/lib
|
--prefix LD_LIBRARY_PATH : ${poppler.out}/lib
|
||||||
'';
|
'';
|
||||||
|
|
||||||
dontStrip = true;
|
dontStrip = true;
|
||||||
|
@ -66,7 +66,7 @@ rec {
|
|||||||
# did the same thing in texLive, but couldn't get it to carry to the
|
# did the same thing in texLive, but couldn't get it to carry to the
|
||||||
# binaries installed by texLiveFull
|
# binaries installed by texLiveFull
|
||||||
for prog in $out/bin/*; do
|
for prog in $out/bin/*; do
|
||||||
wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${poppler}/lib"
|
wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${poppler.out}/lib"
|
||||||
done
|
done
|
||||||
'' ) [ "minInit" "defEnsureDir" "addInputs" ];
|
'' ) [ "minInit" "defEnsureDir" "addInputs" ];
|
||||||
|
|
||||||
|
@ -30,7 +30,7 @@ rec {
|
|||||||
setupHook = ./setup-hook.sh;
|
setupHook = ./setup-hook.sh;
|
||||||
|
|
||||||
doMainBuild = fullDepEntry ( stdenv.lib.optionalString stdenv.isDarwin ''
|
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
|
||||||
mkdir -p $out/nix-support
|
mkdir -p $out/nix-support
|
||||||
@ -106,7 +106,7 @@ rec {
|
|||||||
PATH=$PATH:$out/bin mktexlsr $out/share/texmf*
|
PATH=$PATH:$out/bin mktexlsr $out/share/texmf*
|
||||||
'' + stdenv.lib.optionalString stdenv.isDarwin ''
|
'' + stdenv.lib.optionalString stdenv.isDarwin ''
|
||||||
for prog in $out/bin/*; do
|
for prog in $out/bin/*; do
|
||||||
wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${poppler}/lib"
|
wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${poppler.out}/lib"
|
||||||
done
|
done
|
||||||
'' ) [ "minInit" "defEnsureDir" "doUnpack" "doMakeInstall" "promoteLibexec" "patchShebangsInterim"];
|
'' ) [ "minInit" "defEnsureDir" "doUnpack" "doMakeInstall" "promoteLibexec" "patchShebangsInterim"];
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user