diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2021-04-28 03:44:38 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2021-05-05 22:43:07 +0200 |
| commit | 14b9221ad3bc386a96047c278c6eec3301126bc1 (patch) | |
| tree | 78413132c768712b1df2eff7979a46b5a00e81ec /pkgs/development/libraries/poppler | |
| parent | 702d3e27942e5f0ed6f71b1f5f97cc19aa6b8825 (diff) | |
| download | nixpkgs-14b9221ad3bc386a96047c278c6eec3301126bc1.tar nixpkgs-14b9221ad3bc386a96047c278c6eec3301126bc1.tar.gz nixpkgs-14b9221ad3bc386a96047c278c6eec3301126bc1.tar.bz2 nixpkgs-14b9221ad3bc386a96047c278c6eec3301126bc1.tar.lz nixpkgs-14b9221ad3bc386a96047c278c6eec3301126bc1.tar.xz nixpkgs-14b9221ad3bc386a96047c278c6eec3301126bc1.tar.zst nixpkgs-14b9221ad3bc386a96047c278c6eec3301126bc1.zip | |
poppler_gi: fix build on Darwin
Diffstat (limited to 'pkgs/development/libraries/poppler')
| -rw-r--r-- | pkgs/development/libraries/poppler/default.nix | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index fd2a8ab92cf..5a41fb0c341 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -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="; + }) + ]; +}) |