public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix optional gtk-mac-integration

This commit is contained in:
Pallav Agarwal 2018-02-15 13:14:40 +05:30
parent b484164017
commit c0fcdb5484
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/misc/zathura/djvu/default.nix
View File

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
patches = [ ./gtkflags.patch ]; patches = [ ./gtkflags.patch ];
patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
string1='-shared ''${LDFLAGS} -o $@ ''$(OBJECTS) ''${LIBS}' string1='-shared ''${LDFLAGS} -o $@ ''$(OBJECTS) ''${LIBS}'
string2='-Wl,-dylib_install_name,''${PLUGIN}.dylib -Wl,-bundle_loader,${zathura_core}/bin/.zathura-wrapped -bundle ''${LDFLAGS} -o $@ ''${OBJECTS} ''${LIBS}' string2='-Wl,-dylib_install_name,''${PLUGIN}.dylib -Wl,-bundle_loader,${zathura_core}/bin/.zathura-wrapped -bundle ''${LDFLAGS} -o $@ ''${OBJECTS} ''${LIBS}'
makefileC1=$(sed -r 's/\.so/.dylib/g' Makefile) makefileC1=$(sed -r 's/\.so/.dylib/g' Makefile)

3
pkgs/applications/misc/zathura/pdf-mupdf/default.nix
View File

@ -15,10 +15,11 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
zathura_core gtk girara openssl mupdf libjpeg jbig2dec openjpeg zathura_core gtk girara openssl mupdf libjpeg jbig2dec openjpeg
] ++ stdenv.lib.optional stdenv.isDarwin [
gtk-mac-integration gtk-mac-integration
]; ];
patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
string1='-shared ''${LDFLAGS} -o $@ ''$(OBJECTS) ''${LIBS}' string1='-shared ''${LDFLAGS} -o $@ ''$(OBJECTS) ''${LIBS}'
string2='-Wl,-dylib_install_name,''${PLUGIN}.dylib -Wl,-bundle_loader,${zathura_core}/bin/.zathura-wrapped -bundle ''${LDFLAGS} -o $@ ''${OBJECTS} ''${LIBS}' string2='-Wl,-dylib_install_name,''${PLUGIN}.dylib -Wl,-bundle_loader,${zathura_core}/bin/.zathura-wrapped -bundle ''${LDFLAGS} -o $@ ''${OBJECTS} ''${LIBS}'
makefileC1=$(sed -r 's/\.so/.dylib/g' Makefile) makefileC1=$(sed -r 's/\.so/.dylib/g' Makefile)

2
pkgs/applications/misc/zathura/pdf-poppler/default.nix
View File

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
makeFlags = [ "PREFIX=$(out)" "PLUGINDIR=$(out)/lib" ]; makeFlags = [ "PREFIX=$(out)" "PLUGINDIR=$(out)/lib" ];
patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
string1='-shared ''${LDFLAGS} -o $@ ''$(OBJECTS) ''${LIBS}' string1='-shared ''${LDFLAGS} -o $@ ''$(OBJECTS) ''${LIBS}'
string2='-Wl,-dylib_install_name,''${PLUGIN}.dylib -Wl,-bundle_loader,${zathura_core}/bin/.zathura-wrapped -bundle ''${LDFLAGS} -o $@ ''${OBJECTS} ''${LIBS}' string2='-Wl,-dylib_install_name,''${PLUGIN}.dylib -Wl,-bundle_loader,${zathura_core}/bin/.zathura-wrapped -bundle ''${LDFLAGS} -o $@ ''${OBJECTS} ''${LIBS}'
makefileC1=$(sed -r 's/\.so/.dylib/g' Makefile) makefileC1=$(sed -r 's/\.so/.dylib/g' Makefile)

2
pkgs/applications/misc/zathura/ps/default.nix
View File

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
patches = [ ./gtkflags.patch ]; patches = [ ./gtkflags.patch ];
patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
makefileC1=$(sed -r 's/\.so/.dylib/g' Makefile) makefileC1=$(sed -r 's/\.so/.dylib/g' Makefile)
makefileC2=$(echo "$makefileC1" | sed 's|-shared ''${LDFLAGS} -o $@ ''$(OBJECTS) ''${LIBS}|-Wl,-dylib_install_name,''${PLUGIN}.dylib -Wl,-bundle_loader,${zathura_core}/bin/.zathura-wrapped -bundle ''${LDFLAGS} -o $@ ''${OBJECTS} ''${LIBS}|g' ) makefileC2=$(echo "$makefileC1" | sed 's|-shared ''${LDFLAGS} -o $@ ''$(OBJECTS) ''${LIBS}|-Wl,-dylib_install_name,''${PLUGIN}.dylib -Wl,-bundle_loader,${zathura_core}/bin/.zathura-wrapped -bundle ''${LDFLAGS} -o $@ ''${OBJECTS} ''${LIBS}|g' )
echo "$makefileC2" > Makefile echo "$makefileC2" > Makefile