diff options
| author | toonn <toonn@toonn.io> | 2022-03-09 13:24:16 +0100 |
|---|---|---|
| committer | toonn <toonn@toonn.io> | 2022-03-21 14:28:13 +0100 |
| commit | a149e9b220990da7fd97689742597324dcedba71 (patch) | |
| tree | b7829c38ecf83c056e3a271c99a31f756c2abd4b /pkgs/applications/misc/mupdf | |
| parent | 9eb200121764dfa8a57acd906dfccf60d760e2fc (diff) | |
| download | nixpkgs-a149e9b220990da7fd97689742597324dcedba71.tar nixpkgs-a149e9b220990da7fd97689742597324dcedba71.tar.gz nixpkgs-a149e9b220990da7fd97689742597324dcedba71.tar.bz2 nixpkgs-a149e9b220990da7fd97689742597324dcedba71.tar.lz nixpkgs-a149e9b220990da7fd97689742597324dcedba71.tar.xz nixpkgs-a149e9b220990da7fd97689742597324dcedba71.tar.zst nixpkgs-a149e9b220990da7fd97689742597324dcedba71.zip | |
mupdf: Unbreak build on Darwin
Recent changes (ea5dd0974d1e74d7338a8763b0f313bb09fa5ed9) dropped a patch Darwin needed. I've added a new unconditional patch, because it doesn't affect Linux and this way it's more obvious when the patch needs updating. I decided to add the `xcbuild` dependency because the upstream build uses `xcrun` and I don't know of a good reason not to.
Diffstat (limited to 'pkgs/applications/misc/mupdf')
| -rw-r--r-- | pkgs/applications/misc/mupdf/default.nix | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index cbe50cfdb3c..ae8eed05b9f 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -21,6 +21,7 @@ , enableGL ? true , freeglut , libGLU +, xcbuild }: let @@ -39,7 +40,9 @@ stdenv.mkDerivation rec { sha256 = "1vfyhlqq1a0k0drcggly4bgsjasmf6lmpfbdi5xcrwdbzkagrbr1"; }; - patches = ./0001-Use-command-v-in-favor-of-which.patch; + patches = [ ./0001-Use-command-v-in-favor-of-which.patch + ./0002-Add-Darwin-deps.patch + ]; postPatch = '' sed -i "s/__OPENJPEG__VERSION__/${openJpegVersion}/" source/fitz/load-jpx.c @@ -54,6 +57,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ freetype harfbuzz openjpeg jbig2dec libjpeg gumbo ] + ++ lib.optional stdenv.isDarwin xcbuild ++ lib.optionals enableX11 [ libX11 libXext libXi libXrandr ] ++ lib.optionals enableCurl [ curl openssl ] ++ lib.optionals enableGL ( |