From 98237a67c733e5ed513d891907dd38b7e23c031f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 11 Jan 2024 06:12:45 -0800 Subject: [PATCH 1/4] mupdf-headless: init at 1.23.6 --- pkgs/applications/misc/mupdf/default.nix | 5 +++-- pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index 7e172f279d44..b2c2335db0b2 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -98,9 +98,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ] ++ lib.optional (enableGL || enableX11) copyDesktopItems + ++ lib.optional (stdenv.isDarwin && (enableGL || enableX11)) desktopToDarwinBundle ++ lib.optionals (enableCxx || enablePython) [ python3 python3.pkgs.setuptools python3.pkgs.libclang ] ++ lib.optionals (enablePython) [ which swig ] - ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle fixDarwinDylibNames xcbuild ]; + ++ lib.optionals stdenv.isDarwin [ fixDarwinDylibNames xcbuild ]; buildInputs = [ freetype harfbuzz openjpeg jbig2dec libjpeg gumbo ] ++ lib.optionals enableX11 [ libX11 libXext libXi libXrandr ] @@ -126,7 +127,7 @@ stdenv.mkDerivation rec { done ''; - desktopItems = [ + desktopItems = lib.optionals (enableGL || enableX11) [ (makeDesktopItem { name = pname; desktopName = pname; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8774ebe1cb6e..6fffc03c5e46 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34236,6 +34236,10 @@ with pkgs; }; mupdf = callPackage ../applications/misc/mupdf { }; + mupdf-headless = mupdf.override { + enableX11 = false; + enableGL = false; + }; mupdf_1_17 = callPackage ../applications/misc/mupdf/1.17 { }; muso = callPackage ../applications/audio/muso { From 20c11b364d4e6318ae58a5522e099f8c08f205fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 11 Jan 2024 06:15:19 -0800 Subject: [PATCH 2/4] python311Packages.pikepdf: use mupdf-headless --- pkgs/development/python-modules/pikepdf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix index 788c195d5d61..386f64718eb0 100644 --- a/pkgs/development/python-modules/pikepdf/default.nix +++ b/pkgs/development/python-modules/pikepdf/default.nix @@ -7,7 +7,7 @@ , jbig2dec , deprecated , lxml -, mupdf +, mupdf-headless , numpy , packaging , pillow @@ -46,7 +46,7 @@ buildPythonPackage rec { (substituteAll { src = ./paths.patch; jbig2dec = lib.getExe' jbig2dec "jbig2dec"; - mutool = lib.getExe' mupdf "mutool"; + mutool = lib.getExe' mupdf-headless "mutool"; }) ]; From e062c9d93c04f9734310b0e6b6abd05ecd40ffa6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 11 Jan 2024 06:15:56 -0800 Subject: [PATCH 3/4] python311Packages.img2pdf: use mupdf-headless --- pkgs/development/python-modules/img2pdf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/img2pdf/default.nix b/pkgs/development/python-modules/img2pdf/default.nix index 1a69525d8438..2dc389f70ecc 100644 --- a/pkgs/development/python-modules/img2pdf/default.nix +++ b/pkgs/development/python-modules/img2pdf/default.nix @@ -12,7 +12,7 @@ , exiftool , ghostscript , imagemagick -, mupdf +, mupdf-headless , netpbm , numpy , poppler_utils @@ -74,7 +74,7 @@ buildPythonPackage rec { exiftool ghostscript imagemagick - mupdf + mupdf-headless netpbm numpy poppler_utils From 674a5019a494cf67c615ad250b0209ba15013375 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 11 Jan 2024 06:27:43 -0800 Subject: [PATCH 4/4] desktopToDarwinBundle: use imagemagick_light --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6fffc03c5e46..a88ac5936cf2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1425,7 +1425,7 @@ with pkgs; desktopToDarwinBundle = makeSetupHook { name = "desktop-to-darwin-bundle-hook"; - propagatedBuildInputs = [ writeDarwinBundle librsvg imagemagick python3Packages.icnsutil ]; + propagatedBuildInputs = [ writeDarwinBundle librsvg imagemagick_light python3Packages.icnsutil ]; } ../build-support/setup-hooks/desktop-to-darwin-bundle.sh; keepBuildTree = makeSetupHook {