diff options
| author | Lancelot SIX <lsix@lancelotsix.com> | 2016-01-09 01:24:28 +0100 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-02-06 01:30:07 +0000 |
| commit | c5379e7da80bbc5cf003daf2672a27d2b170bbaf (patch) | |
| tree | 766171b3f1d8aaf9371b254b2c1a7d92f9c2a835 /pkgs/applications/graphics/darktable | |
| parent | cbf2286506802895f89c9bfe6c4d1b22886a5577 (diff) | |
pkgs.darktable: 1.6.9 -> 2.0.0
See http://www.darktable.org/2015/12/darktable-2-0-released/
changes by @globin: added wrapGAppsHook and adwaita-icon-theme
Signed-off-by: Robin Gloster <mail@glob.in>
Diffstat (limited to 'pkgs/applications/graphics/darktable')
| -rw-r--r-- | pkgs/applications/graphics/darktable/default.nix | 35 |
1 files changed, 12 insertions, 23 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" ]; |