public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

poppler: drop patches already contained in src

Browse Source
This commit is contained in:
Vladimír Čunát 2021-05-21 09:09:20 +02:00
parent 2b12bace86
commit acb7a605e2
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,7 +30,7 @@
let let
mkFlag = optset: flag: "-DENABLE_${flag}=${if optset then "on" else "off"}"; mkFlag = optset: flag: "-DENABLE_${flag}=${if optset then "on" else "off"}";
in in
stdenv.mkDerivation (rec { stdenv.mkDerivation rec {
name = "poppler-${suffix}-${version}"; name = "poppler-${suffix}-${version}";
version = "21.05.0"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too! version = "21.05.0"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too!
@ -110,17 +110,4 @@ stdenv.mkDerivation (rec {
platforms = platforms.all; platforms = platforms.all;
maintainers = with maintainers; [ ttuegel ] ++ teams.freedesktop.members; 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=";
})
];
})