diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-02-07 13:52:42 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-02-07 13:52:42 +0100 |
commit | a115bff08c1f2046957d09a6a908202d1b98c311 (patch) | |
tree | e15cfb7f524284fcefa5119e7ee0abe2ae1096d9 /pkgs/applications/graphics | |
parent | 234f4611393a6818b317f3ad93d2e276515bdc33 (diff) | |
parent | 98ffc61e2f846c4818280a4cccce3fdad3eb9677 (diff) | |
download | nixlib-a115bff08c1f2046957d09a6a908202d1b98c311.tar nixlib-a115bff08c1f2046957d09a6a908202d1b98c311.tar.gz nixlib-a115bff08c1f2046957d09a6a908202d1b98c311.tar.bz2 nixlib-a115bff08c1f2046957d09a6a908202d1b98c311.tar.lz nixlib-a115bff08c1f2046957d09a6a908202d1b98c311.tar.xz nixlib-a115bff08c1f2046957d09a6a908202d1b98c311.tar.zst nixlib-a115bff08c1f2046957d09a6a908202d1b98c311.zip |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/applications/graphics')
-rw-r--r-- | pkgs/applications/graphics/darktable/default.nix | 35 | ||||
-rw-r--r-- | pkgs/applications/graphics/synfigstudio/default.nix | 48 |
2 files changed, 44 insertions, 39 deletions
diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index 77bddc89e2fc..ef222d2e816f 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -1,46 +1,35 @@ { stdenv, fetchurl, libsoup, graphicsmagick, SDL, json_glib , GConf, atk, cairo, cmake, curl, dbus_glib, exiv2, glib -, libgnome_keyring, gtk, ilmbase, intltool, lcms, lcms2 +, libgnome_keyring, gtk3, ilmbase, intltool, lcms, lcms2 , lensfun, libXau, libXdmcp, libexif, libglade, libgphoto2, libjpeg -, libpng, libpthreadstubs, libraw1394, librsvg, libtiff, libxcb +, libpng, libpthreadstubs, librsvg, libtiff, libxcb , openexr, pixman, pkgconfig, sqlite, bash, libxslt, openjpeg -, mesa }: +, mesa, lua, pugixml, colord, colord-gtk, libxshmfence, libxkbcommon +, epoxy, at_spi2_core, libwebp, libsecret, wrapGAppsHook, gnome3 +}: assert stdenv ? glibc; stdenv.mkDerivation rec { - version = "1.6.9"; + version = "2.0.0"; name = "darktable-${version}"; src = fetchurl { url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"; - sha256 = "0wri89ygjpv7npiz58mnydhgldywp6arqp9jq3v0g54a56fiwwhg"; + sha256 = "1cbwvzqn3158cy7r499rdwipx7fpb30lrrvh6jy5a4xvpcjzbwnl"; }; buildInputs = - [ GConf atk cairo cmake curl dbus_glib exiv2 glib libgnome_keyring gtk + [ GConf atk cairo cmake curl dbus_glib exiv2 glib libgnome_keyring gtk3 ilmbase intltool lcms lcms2 lensfun libXau libXdmcp libexif - libglade libgphoto2 libjpeg libpng libpthreadstubs libraw1394 + libglade libgphoto2 libjpeg libpng libpthreadstubs librsvg libtiff libxcb openexr pixman pkgconfig sqlite libxslt - libsoup graphicsmagick SDL json_glib openjpeg mesa + libsoup graphicsmagick SDL json_glib openjpeg mesa lua pugixml + colord colord-gtk libxshmfence libxkbcommon epoxy at_spi2_core + libwebp libsecret wrapGAppsHook gnome3.adwaita-icon-theme ]; - preConfigure = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk}/include/gtk-2.0" - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk}/lib/gtk-2.0/include" - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${cairo}/include/cairo" - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${atk}/include/atk-1.0" - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${ilmbase}/include/OpenEXR" - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${openexr}/include/OpenEXR" - ''; - cmakeFlags = [ - "-DPTHREAD_INCLUDE_DIR=${stdenv.glibc}/include" - "-DPTHREAD_LIBRARY=${stdenv.glibc}/lib/libpthread.so" - "-DCMAKE_BUILD_TYPE=Release" - "-DBINARY_PACKAGE_BUILD=1" - "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib}/lib/glib-2.0/include" - "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk}/lib/gtk-2.0/include" "-DBUILD_USERMANUAL=False" ]; diff --git a/pkgs/applications/graphics/synfigstudio/default.nix b/pkgs/applications/graphics/synfigstudio/default.nix index 372c11b5bda5..0dd4eab35f1e 100644 --- a/pkgs/applications/graphics/synfigstudio/default.nix +++ b/pkgs/applications/graphics/synfigstudio/default.nix @@ -1,51 +1,67 @@ -{ stdenv, fetchurl, boost, cairo, fontsConf, gettext, glibmm, gtk3, gtkmm3 +{ stdenv, fetchFromGitHub, boost, cairo, fontsConf, gettext, glibmm, gtk3, gtkmm3 , libjack2, libsigcxx, libtool, libxmlxx, makeWrapper, mlt-qt5, pango, pkgconfig -, imagemagick, intltool +, imagemagick, intltool, autoreconfHook, which }: let - version = "1.0.1"; + version = "1.0.2"; ETL = stdenv.mkDerivation rec { name = "ETL-0.04.19"; - src = fetchurl { - url = "http://download.tuxfamily.org/synfig/releases/${version}/${name}.tar.gz"; - sha256 = "1zmqv2fa5zxprza3wbhk5mxjk7491jqshxxai92s7fdiza0nhs91"; + src = fetchFromGitHub { + repo = "synfig"; + owner = "synfig"; + rev = version; + sha256 = "09ldkvzczqvb1yvlibd62y56dkyprxlr0w3rk38rcs7jnrhj2cqc"; }; + + postUnpack = "sourceRoot=\${sourceRoot}/ETL/"; + + buildInputs = [ autoreconfHook ]; }; synfig = stdenv.mkDerivation rec { name = "synfig-${version}"; - src = fetchurl { - url = "http://download.tuxfamily.org/synfig/releases/${version}/${name}.tar.gz"; - sha256 = "0l1f2xwmzds32g46fqwsq7j5qlnfps6944chbv14d3ynzgyyp1i3"; + src = fetchFromGitHub { + repo = "synfig"; + owner = "synfig"; + rev = version; + sha256 = "09ldkvzczqvb1yvlibd62y56dkyprxlr0w3rk38rcs7jnrhj2cqc"; }; + postUnpack = "sourceRoot=\${sourceRoot}/synfig-core/"; + configureFlags = [ "--with-boost=${boost.dev}" "--with-boost-libdir=${boost.lib}/lib" ]; buildInputs = [ - ETL boost cairo gettext glibmm mlt-qt5 libsigcxx libtool libxmlxx pango - pkgconfig + ETL boost cairo gettext glibmm mlt-qt5 libsigcxx libxmlxx pango + pkgconfig autoreconfHook ]; }; in stdenv.mkDerivation rec { name = "synfigstudio-${version}"; - src = fetchurl { - url = "http://download.tuxfamily.org/synfig/releases/${version}/${name}.tar.gz"; - sha256 = "0jfa946rfh0dbagp18zknlj9ffrd4h45xcy2dh2vlhn6jdm08yfi"; + src = fetchFromGitHub { + repo = "synfig"; + owner = "synfig"; + rev = version; + sha256 = "09ldkvzczqvb1yvlibd62y56dkyprxlr0w3rk38rcs7jnrhj2cqc"; }; + postUnpack = "sourceRoot=\${sourceRoot}/synfig-studio/"; + + preConfigure = "./bootstrap.sh"; + buildInputs = [ ETL boost cairo gettext glibmm gtk3 gtkmm3 imagemagick intltool - libjack2 libsigcxx libtool libxmlxx makeWrapper mlt-qt5 pkgconfig - synfig + libjack2 libsigcxx libxmlxx makeWrapper mlt-qt5 pkgconfig + synfig autoreconfHook which ]; postInstall = '' |