Skip to content

zathura-pdf-mupdf: 0.4.2 -> 0.4.3 #325136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
laalsaas wants to merge 2 commits into from
Closed

zathura-pdf-mupdf: 0.4.2 -> 0.4.3 #325136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4723bca
mupdf: 1.23.5 -> 1.24.5
laalsaas Jul 6, 2024
2e7ff4d
zathura-pdf-mupdf: 0.4.2 -> 0.4.3
laalsaas Jul 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions pkgs/applications/misc/mupdf/0001-Use-command-v-in-favor-of-which.patch
View file
Open in desktop

This file was deleted.

19 changes: 11 additions & 8 deletions pkgs/applications/misc/mupdf/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,18 +60,18 @@ let

in
stdenv.mkDerivation rec {
version = "1.23.6";
version = "1.24.5";
pname = "mupdf";

src = fetchurl {
url = "https://mupdf.com/downloads/archive/${pname}-${version}-source.tar.gz";
sha256 = "sha256-rBHrhZ3UBEiOUVPNyWUbtDQeW6r007Pyfir8gvmq3Ck=";
sha256 = "sha256-NNRXos6T6U77kgucTcGkD9ileOLXQSTVUQpZzv6dO6M=";
};

patches = [ ./0001-Use-command-v-in-favor-of-which.patch
./0002-Add-Darwin-deps.patch
./0003-Fix-cpp-build.patch
];
patches = [
./0002-Add-Darwin-deps.patch
./0003-Fix-cpp-build.patch
];

postPatch = ''
substituteInPlace Makerules --replace "(shell pkg-config" "(shell $PKG_CONFIG"
Expand Down Expand Up @@ -165,14 +165,17 @@ stdenv.mkDerivation rec {
Cflags: -I\''${includedir}
EOF

ln -s $out/lib/libmupdf.so.24.5 $out/lib/libmupdf.so
Copy link
Contributor Author

@laalsaas laalsaas Jul 7, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There might be a more elegant way of doing this

moveToOutput "bin" "$bin"
'' + (lib.optionalString (stdenv.isDarwin) ''
for exe in $bin/bin/*; do
install_name_tool -change build/shared-release/libmupdf.dylib $out/lib/libmupdf.dylib "$exe"
done
'') + (lib.optionalString (enableX11 || enableGL) ''
mkdir -p $bin/share/icons/hicolor/48x48/apps
cp docs/logo/mupdf.png $bin/share/icons/hicolor/48x48/apps
for i in 16 24 32 48 72 128 256 512; do
install -D docs/logo/mupdf-icon-''${i}.png $bin/share/icons/hicolor/''${i}x''${i}/apps/mupdf.png
done
install -D docs/logo/mupdf-icon.svg $bin/share/icons/hicolor/scalable/apps/mupdf.svg
'') + (if enableGL then ''
ln -s "$bin/bin/mupdf-gl" "$bin/bin/mupdf"
'' else lib.optionalString (enableX11) ''
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/misc/zathura/pdf-mupdf/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@
}:

stdenv.mkDerivation rec {
version = "0.4.2";
version = "0.4.3";
pname = "zathura-pdf-mupdf";

src = fetchurl {
url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz";
hash = "sha256-fFC+z9mJX9ccExsV336Ut+zJJa8UdfUz/qVp9YgcnhM=";
hash = "sha256-jM+E7gh+pyqOiLsvJanAELrqJhzrUsw/cyq60l93Z3Y=";
};

nativeBuildInputs = [
Expand Down