Unverified Commit 0bf1638c authored by Jan Tojnar's avatar Jan Tojnar Committed by GitHub
Browse files

Merge pull request #201781 from jtojnar/gimp-deps 

babl,gegl: update
parents 45f8f858 4e732ec0

pkgs/development/libraries/babl/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -12,13 +12,13 @@ 


stdenv.mkDerivation rec {

  pname = "babl";

  version = "0.1.96";

  version = "0.1.98";



  outputs = [ "out" "dev" ];



  src = fetchurl {

    url = "https://download.gimp.org/pub/babl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";

    sha256 = "sha256-M2c/5Fmpg/QRJFpJ+B/X8ZZq8eqOypsJWpQMVCuFRfY=";

    sha256 = "87Ii+E5GJzXeY/qcNlGULyt4/TFMc6IuBf98c6/SOvE=";

  };



  nativeBuildInputs = [

pkgs/development/libraries/gegl/default.nix

+8 −3
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
, glib

, babl

, libpng

, llvmPackages

, cairo

, libjpeg

, librsvg
@@ -36,14 +37,14 @@ 


stdenv.mkDerivation rec {

  pname = "gegl";

  version = "0.4.38";

  version = "0.4.40";



  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-5KM8hDClBC+6hDm1lTSOcYcPDZX7+IX/VT+QIMG+11A=";

    sha256 = "zd6A0VpJ2rmmFO+Y+ATIzm5M/hM5o8JAw08/tFQ2uF0=";

  };



  nativeBuildInputs = [
@@ -77,7 +78,11 @@ stdenv.mkDerivation rec { 
    luajit

    openexr

    suitesparse

  ] ++ lib.optional stdenv.isDarwin OpenCL;

  ] ++ lib.optionals stdenv.isDarwin [

    OpenCL

  ] ++ lib.optionals stdenv.cc.isClang [

    llvmPackages.openmp

  ];



  # for gegl-4.0.pc

  propagatedBuildInputs = [