From e892890088c14a61e9a090a89cf8d0d0f61691ae Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Tue, 14 Nov 2023 09:08:43 -0500 Subject: mupdf: move xcbuild to nativeBuildInputs xcbuild provides tools that execute during the build, so it needs to be in `nativeBuildInputs` instead of `buildInputs`. --- pkgs/applications/misc/mupdf/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index 438134981499..ebd1e8e97b26 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -99,10 +99,9 @@ stdenv.mkDerivation rec { ++ lib.optional (enableGL || enableX11) copyDesktopItems ++ lib.optionals (enableCxx || enablePython) [ python3 python3.pkgs.setuptools python3.pkgs.libclang ] ++ lib.optionals (enablePython) [ which swig ] - ++ lib.optional stdenv.isDarwin desktopToDarwinBundle; + ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle xcbuild ]; 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 ( -- cgit 1.4.1 From 29455886e21c45b8c0b33c57a1b12d1b2c709e25 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 15 Nov 2023 04:20:00 +0000 Subject: mupdf: fix darwin dylib --- pkgs/applications/misc/mupdf/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index ebd1e8e97b26..db08bd5c14ce 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -7,6 +7,7 @@ , desktopToDarwinBundle , buildPackages , pkg-config +, fixDarwinDylibNames , freetype , harfbuzz , openjpeg @@ -99,7 +100,7 @@ stdenv.mkDerivation rec { ++ lib.optional (enableGL || enableX11) copyDesktopItems ++ lib.optionals (enableCxx || enablePython) [ python3 python3.pkgs.setuptools python3.pkgs.libclang ] ++ lib.optionals (enablePython) [ which swig ] - ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle xcbuild ]; + ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle fixDarwinDylibNames xcbuild ]; buildInputs = [ freetype harfbuzz openjpeg jbig2dec libjpeg gumbo ] ++ lib.optionals enableX11 [ libX11 libXext libXi libXrandr ] -- cgit 1.4.1