summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Schütz <nix@dotlambda.de>2024-01-11 06:12:45 -0800
committerRobert Schütz <nix@dotlambda.de>2024-01-11 06:42:40 -0800
commit98237a67c733e5ed513d891907dd38b7e23c031f (patch)
tree037af72d61b204dad90f434a0d75b0e560aae127
parentcdd62b2f565ecbfc75237052c998421a01fd0fe7 (diff)
mupdf-headless: init at 1.23.6
-rw-r--r--pkgs/applications/misc/mupdf/default.nix5
-rw-r--r--pkgs/top-level/all-packages.nix4
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 {