pyrox.dev
poppler: drop patches already contained in src
+2
-15
pkgs/development/libraries/poppler/default.nix
+2
-15
pkgs/development/libraries/poppler/default.nix
···
30
30
let
31
31
mkFlag = optset: flag: "-DENABLE_${flag}=${if optset then "on" else "off"}";
32
32
in
33
-
stdenv.mkDerivation (rec {
33
+
stdenv.mkDerivation rec {
34
34
name = "poppler-${suffix}-${version}";
35
35
version = "21.05.0"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too!
36
36
···
110
110
platforms = platforms.all;
111
111
maintainers = with maintainers; [ ttuegel ] ++ teams.freedesktop.members;
112
112
};
113
-
} // lib.optionalAttrs stdenv.isDarwin {
114
-
patches = [
115
-
# Fix build due to improperly used volatile in poppler-glib.
116
-
# https://gitlab.freedesktop.org/poppler/poppler/merge_requests/836
117
-
(fetchpatch {
118
-
url = "https://gitlab.freedesktop.org/poppler/poppler/commit/47de887d7658cfd68df44b3acf710971054f957b.patch";
119
-
sha256 = "uvYibBn2fOEqdotxK0Wpf8KhGYZXrpHdmS4jjlRNCj8=";
120
-
})
121
-
(fetchpatch {
122
-
url = "https://gitlab.freedesktop.org/poppler/poppler/commit/bdd110b45a38e8a4f80f522892e4c4a9e432abd5.patch";
123
-
sha256 = "WDUYXX6v5zk7tusz7DGBP58yFzgEvoBlNSLbfk7+QTc=";
124
-
})
125
-
];
126
-
})
113
+
}