git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #67416 from jtojnar/babl-0.1.72

babl: 0.1.66 → 0.1.72

commit02bc9e463c87300af571923f099d90d02ed03b41 authorJan Tojnar <jtojnar@gmail.com> dateMon 26 Aug 2019, 14:57 (7 years ago) parenta859d0cba2a16f
4 files changed+47−47
pkgs/development/libraries/babl/default.nix+31−5 pkgs/development/libraries/babl/fix-darwin.patch+16 pkgs/development/libraries/gegl/3.0.nix−38 pkgs/top-level/all-packages.nix−4
pkgs/development/libraries/babl/default.nix+31−5
@@ -1,15 +1,41 @@
1−{ stdenv, fetchurl }:
1+{ stdenv
2+, fetchurl
3+, meson
4+, ninja
5+, pkgconfig
6+, gobject-introspection
7+, lcms2
8+}:
29
310stdenv.mkDerivation rec {
411 pname = "babl";
5− version = "0.1.66";
12+ version = "0.1.72";
13+
14+ outputs = [ "out" "dev" ];
615
716 src = fetchurl {
8− url = "https://ftp.gtk.org/pub/babl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
9− sha256 = "0qx1dwbinxihwl2lmxi60qiqi402jlrdcnixx14kk6j88n9xi79n";
17+ url = "https://download.gimp.org/pub/babl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
18+ sha256 = "0hkagjrnza77aasa1kss5hvy37ndm50y6i7hkdn2z8hzgc4i3qb4";
1019 };
1120
12− doCheck = true;
21+ patches = [
22+ # Apple linker does not know --version-script flag
23+ # https://gitlab.gnome.org/GNOME/babl/merge_requests/26
24+ ./fix-darwin.patch
25+ ];
26+
27+ nativeBuildInputs = [
28+ meson
29+ ninja
30+ pkgconfig
31+ gobject-introspection
32+ ];
33+
34+ buildInputs = [
35+ lcms2
36+ ];
37+
38+ doCheck = !stdenv.isDarwin;
1339
1440 meta = with stdenv.lib; {
1541 description = "Image pixel format conversion library";
pkgs/development/libraries/babl/fix-darwin.patchnew file+16
@@ -0,0 +1,16 @@
1+diff --git a/babl/meson.build b/babl/meson.build
2+index b551c9a..f452435 100644
3+--- a/babl/meson.build
4++++ b/babl/meson.build
5+@@ -24,9 +24,9 @@
6+ ]
7+
8+ # Linker arguments
9+-babl_link_args = [
10++babl_link_args = cc.get_supported_link_arguments([
11+ '-Wl,--version-script,' + version_script,
12+-]
13++])
14+ if platform_win32
15+ babl_link_args += '-Wl,--no-undefined'
16+ endif
pkgs/development/libraries/gegl/3.0.nixdeleted−38
@@ -1,38 +0,0 @@
1−{ stdenv, fetchurl, pkgconfig, glib, babl, libpng, cairo, libjpeg, which
2−, librsvg, pango, gtk, bzip2, json-glib, intltool, autoreconfHook, libraw
3−, libwebp, gnome3, libintl }:
4−
5−stdenv.mkDerivation rec {
6− name = "gegl-0.3.34";
7−
8− src = fetchurl {
9− url = "https://download.gimp.org/pub/gegl/0.3/${name}.tar.bz2";
10− sha256 = "010k86wn8cmr07rqwa4lccrmiiqrwbnkxvic4lpapwgbamv258jw";
11− };
12−
13− hardeningDisable = [ "format" ];
14−
15− # needs fonts otherwise don't know how to pass them
16− configureFlags = [ "--disable-docs" ];
17−
18− enableParallelBuilding = true;
19−
20− doCheck = true;
21−
22− buildInputs = [
23− libpng cairo libjpeg librsvg pango gtk bzip2
24− libraw libwebp gnome3.gexiv2
25− ];
26−
27− propagatedBuildInputs = [ glib json-glib babl ]; # for gegl-3.0.pc
28−
29− nativeBuildInputs = [ pkgconfig intltool which autoreconfHook libintl ];
30−
31− meta = with stdenv.lib; {
32− description = "Graph-based image processing framework";
33− homepage = http://www.gegl.org;
34− license = licenses.gpl3;
35− maintainers = with maintainers; [ jtojnar ];
36− platforms = platforms.unix;
37− };
38−}
pkgs/top-level/all-packages.nix−4
@@ -10819,10 +10819,6 @@ in
1081910819 inherit (darwin.apple_sdk.frameworks) OpenGL;
1082010820 };
1082110821
10822− gegl_0_3 = callPackage ../development/libraries/gegl/3.0.nix {
10823− gtk = res.gtk2;
10824− };
10825−
1082610822 gegl_0_4 = callPackage ../development/libraries/gegl/4.0.nix {
1082710823 gtk = res.gtk2;
1082810824 };