cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

poppler_gi: fix build on Darwin

Browse source
This commit is contained in:
Jan Tojnar 2021-04-28 03:44:38 +02:00
parent 702d3e2794
commit 14b9221ad3
No known key found for this signature in database
GPG key ID: 7FAB2A15F7A607A4
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
pkgs/development/libraries/poppler/default.nix
View file

@ -10,7 +10,7 @@
let
mkFlag = optset: flag: "-DENABLE_${flag}=${if optset then "on" else "off"}";
in
stdenv.mkDerivation rec {
stdenv.mkDerivation (rec {
name = "poppler-${suffix}-${version}";
version = "21.02.0"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too!
@ -63,4 +63,17 @@ stdenv.mkDerivation rec {
platforms = platforms.all;
maintainers = with maintainers; [ ttuegel ] ++ teams.freedesktop.members;
};
}
} // lib.optionalAttrs stdenv.isDarwin {
patches = [
# Fix build due to improperly used volatile in poppler-glib.
# https://gitlab.freedesktop.org/poppler/poppler/merge_requests/836
(fetchpatch {
url = "https://gitlab.freedesktop.org/poppler/poppler/commit/47de887d7658cfd68df44b3acf710971054f957b.patch";
sha256 = "uvYibBn2fOEqdotxK0Wpf8KhGYZXrpHdmS4jjlRNCj8=";
})
(fetchpatch {
url = "https://gitlab.freedesktop.org/poppler/poppler/commit/bdd110b45a38e8a4f80f522892e4c4a9e432abd5.patch";
sha256 = "WDUYXX6v5zk7tusz7DGBP58yFzgEvoBlNSLbfk7+QTc=";
})
];
})