diff options
| author | Yves Fischer <yvesf+git@xapek.org> | 2022-09-06 21:44:39 +0200 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2022-09-07 13:11:52 +0200 |
| commit | 48728f5ca4b90407bc83fd02ab5ca7f6ed9d9d93 (patch) | |
| tree | f75e59448db8177a0e18277d07b1a85ac04cde63 | |
| parent | 511cc4866f23abd9eb7ef66a60ce18232d422d02 (diff) | |
| download | nixpkgs-48728f5ca4b90407bc83fd02ab5ca7f6ed9d9d93.tar nixpkgs-48728f5ca4b90407bc83fd02ab5ca7f6ed9d9d93.tar.gz nixpkgs-48728f5ca4b90407bc83fd02ab5ca7f6ed9d9d93.tar.bz2 nixpkgs-48728f5ca4b90407bc83fd02ab5ca7f6ed9d9d93.tar.lz nixpkgs-48728f5ca4b90407bc83fd02ab5ca7f6ed9d9d93.tar.xz nixpkgs-48728f5ca4b90407bc83fd02ab5ca7f6ed9d9d93.tar.zst nixpkgs-48728f5ca4b90407bc83fd02ab5ca7f6ed9d9d93.zip | |
mupdf: fix finding pkg-config under cross-compilation
| -rw-r--r-- | pkgs/applications/misc/mupdf/default.nix | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index 88f804ccf81..2010268eade 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -5,6 +5,7 @@ , copyDesktopItems , makeDesktopItem , desktopToDarwinBundle +, buildPackages , pkg-config , freetype , harfbuzz @@ -49,13 +50,17 @@ stdenv.mkDerivation rec { postPatch = '' sed -i "s/__OPENJPEG__VERSION__/${openJpegVersion}/" source/fitz/load-jpx.c + substituteInPlace Makerules --replace "(shell pkg-config" "(shell $PKG_CONFIG" ''; # Use shared libraries to decrease size buildFlags = [ "shared" ]; - makeFlags = [ "prefix=$(out)" "USE_SYSTEM_LIBS=yes" ] - ++ lib.optionals (!enableX11) [ "HAVE_X11=no" ] + makeFlags = [ + "prefix=$(out)" + "USE_SYSTEM_LIBS=yes" + "PKG_CONFIG=${buildPackages.pkg-config}/bin/${buildPackages.pkg-config.targetPrefix}pkg-config" + ] ++ lib.optionals (!enableX11) [ "HAVE_X11=no" ] ++ lib.optionals (!enableGL) [ "HAVE_GLUT=no" ]; nativeBuildInputs = [ pkg-config ] |