diff options
| author | Pallav Agarwal <pallavagarwal07@gmail.com> | 2018-02-15 13:14:40 +0530 |
|---|---|---|
| committer | Pallav Agarwal <pallavagarwal07@gmail.com> | 2018-02-15 13:14:40 +0530 |
| commit | c0fcdb5484a303d68444ab242bc924abca424715 (patch) | |
| tree | 56cd7652b852f8e8b5324d77265bfae35e56c479 | |
| parent | b4841640171568abfea161d78a1da59e245139d5 (diff) | |
| download | nixpkgs-c0fcdb5484a303d68444ab242bc924abca424715.tar nixpkgs-c0fcdb5484a303d68444ab242bc924abca424715.tar.gz nixpkgs-c0fcdb5484a303d68444ab242bc924abca424715.tar.bz2 nixpkgs-c0fcdb5484a303d68444ab242bc924abca424715.tar.lz nixpkgs-c0fcdb5484a303d68444ab242bc924abca424715.tar.xz nixpkgs-c0fcdb5484a303d68444ab242bc924abca424715.tar.zst nixpkgs-c0fcdb5484a303d68444ab242bc924abca424715.zip | |
Fix optional gtk-mac-integration
4 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/applications/misc/zathura/djvu/default.nix b/pkgs/applications/misc/zathura/djvu/default.nix index ba955d88c5a..d280a10f618 100644 --- a/pkgs/applications/misc/zathura/djvu/default.nix +++ b/pkgs/applications/misc/zathura/djvu/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { patches = [ ./gtkflags.patch ]; - patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' + postPatch = stdenv.lib.optionalString stdenv.isDarwin '' 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}' makefileC1=$(sed -r 's/\.so/.dylib/g' Makefile) diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix index 932633ce32c..1ca7644f60f 100644 --- a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix +++ b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix @@ -15,10 +15,11 @@ stdenv.mkDerivation rec { buildInputs = [ zathura_core gtk girara openssl mupdf libjpeg jbig2dec openjpeg + ] ++ stdenv.lib.optional stdenv.isDarwin [ gtk-mac-integration ]; - patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' + postPatch = stdenv.lib.optionalString stdenv.isDarwin '' 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}' makefileC1=$(sed -r 's/\.so/.dylib/g' Makefile) diff --git a/pkgs/applications/misc/zathura/pdf-poppler/default.nix b/pkgs/applications/misc/zathura/pdf-poppler/default.nix index bd01e5e8c12..215ebdd7564 100644 --- a/pkgs/applications/misc/zathura/pdf-poppler/default.nix +++ b/pkgs/applications/misc/zathura/pdf-poppler/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" "PLUGINDIR=$(out)/lib" ]; - patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' + postPatch = stdenv.lib.optionalString stdenv.isDarwin '' 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}' makefileC1=$(sed -r 's/\.so/.dylib/g' Makefile) diff --git a/pkgs/applications/misc/zathura/ps/default.nix b/pkgs/applications/misc/zathura/ps/default.nix index 1872015d7e8..c324deb28e0 100644 --- a/pkgs/applications/misc/zathura/ps/default.nix +++ b/pkgs/applications/misc/zathura/ps/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { patches = [ ./gtkflags.patch ]; - patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' + postPatch = stdenv.lib.optionalString stdenv.isDarwin '' 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' ) echo "$makefileC2" > Makefile |