mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-18 07:46:09 +01:00
Merge pull request #116478 from jtojnar/gegl-0.4.28
gegl_0_4: 0.4.26 → 0.4.28
This commit is contained in:
commit
0bda4788f0
1 changed files with 6 additions and 14 deletions
|
@ -1,11 +1,10 @@
|
|||
{ lib, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, pkg-config
|
||||
, vala
|
||||
, gobject-introspection
|
||||
, gtk-doc
|
||||
, docbook_xsl
|
||||
, docbook-xsl-nons
|
||||
, docbook_xml_dtd_43
|
||||
, glib
|
||||
, babl
|
||||
|
@ -15,6 +14,7 @@
|
|||
, librsvg
|
||||
, lensfun
|
||||
, libspiro
|
||||
, maxflow
|
||||
, netsurf
|
||||
, pango
|
||||
, poly2tri-c
|
||||
|
@ -35,25 +35,16 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gegl";
|
||||
version = "0.4.26";
|
||||
version = "0.4.28";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
outputBin = "dev";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.gimp.org/pub/gegl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-DzceLtK5IWL+/T3edD5kjKCKahsrBQBIZ/vdx+IR5CQ=";
|
||||
sha256 = "sha256-HRENhXfVTMo7NCOTFb03xXzLJ91DVWVQdKLSs/2JeQA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# fix build with darwin: https://github.com/NixOS/nixpkgs/issues/99108
|
||||
# https://gitlab.gnome.org/GNOME/gegl/-/merge_requests/83
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/gegl/-/merge_requests/83.patch";
|
||||
sha256 = "sha256-CSBYbJ2xnEN23xrla1qqr244jxOR5vNK8ljBSXdg4yE=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
gettext
|
||||
|
@ -62,7 +53,7 @@ stdenv.mkDerivation rec {
|
|||
vala
|
||||
gobject-introspection
|
||||
gtk-doc
|
||||
docbook_xsl
|
||||
docbook-xsl-nons
|
||||
docbook_xml_dtd_43
|
||||
];
|
||||
|
||||
|
@ -73,6 +64,7 @@ stdenv.mkDerivation rec {
|
|||
librsvg
|
||||
lensfun
|
||||
libspiro
|
||||
maxflow
|
||||
netsurf.libnsgif
|
||||
pango
|
||||
poly2tri-c
|
||||
|
|
Loading…
Reference in a new issue