diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/gegl')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/gegl/4.0.nix | 12 | ||||
-rw-r--r-- | nixpkgs/pkgs/development/libraries/gegl/default.nix | 10 |
2 files changed, 11 insertions, 11 deletions
diff --git a/nixpkgs/pkgs/development/libraries/gegl/4.0.nix b/nixpkgs/pkgs/development/libraries/gegl/4.0.nix index c25f9145ea5e..af3c9d84ac7c 100644 --- a/nixpkgs/pkgs/development/libraries/gegl/4.0.nix +++ b/nixpkgs/pkgs/development/libraries/gegl/4.0.nix @@ -1,7 +1,7 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchpatch -, pkgconfig +, pkg-config , vala , gobject-introspection , gtk-doc @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { outputBin = "dev"; src = fetchurl { - url = "https://download.gimp.org/pub/gegl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://download.gimp.org/pub/gegl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "sha256-DzceLtK5IWL+/T3edD5kjKCKahsrBQBIZ/vdx+IR5CQ="; }; @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config gettext meson ninja @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { luajit openexr suitesparse - ] ++ stdenv.lib.optional stdenv.isDarwin OpenCL; + ] ++ lib.optional stdenv.isDarwin OpenCL; # for gegl-4.0.pc propagatedBuildInputs = [ @@ -118,7 +118,7 @@ stdenv.mkDerivation rec { # tests fail to connect to the com.apple.fonts daemon in sandboxed mode doCheck = !stdenv.isDarwin; - meta = with stdenv.lib; { + meta = with lib; { description = "Graph-based image processing framework"; homepage = "https://www.gegl.org"; license = licenses.lgpl3Plus; diff --git a/nixpkgs/pkgs/development/libraries/gegl/default.nix b/nixpkgs/pkgs/development/libraries/gegl/default.nix index a99ec05d771c..bd67f3e6b7ca 100644 --- a/nixpkgs/pkgs/development/libraries/gegl/default.nix +++ b/nixpkgs/pkgs/development/libraries/gegl/default.nix @@ -1,6 +1,6 @@ -{ stdenv +{ lib, stdenv , fetchurl -, pkgconfig +, pkg-config , babl , libpng , cairo @@ -33,13 +33,13 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-docs" ]; buildInputs = [ babl libpng cairo libjpeg librsvg pango gtk2 bzip2 intltool libintl ] - ++ stdenv.lib.optional stdenv.isDarwin OpenGL; + ++ lib.optional stdenv.isDarwin OpenGL; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; doCheck = false; # fails 3 out of 19 tests - meta = with stdenv.lib; { + meta = with lib; { description = "Graph-based image processing framework"; homepage = "https://www.gegl.org"; license = licenses.lgpl3Plus; |