From 1f82083c20b01b0039f67f03a351eae9a284019d Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Mon, 8 Apr 2013 18:21:55 +0200 Subject: [PATCH] darktable: Update to 1.2 --- .../graphics/darktable/1.2rc1.nix | 53 ------------------- .../graphics/darktable/default.nix | 6 +-- pkgs/top-level/all-packages.nix | 4 -- 3 files changed, 3 insertions(+), 60 deletions(-) delete mode 100644 pkgs/applications/graphics/darktable/1.2rc1.nix diff --git a/pkgs/applications/graphics/darktable/1.2rc1.nix b/pkgs/applications/graphics/darktable/1.2rc1.nix deleted file mode 100644 index 906240d864f..00000000000 --- a/pkgs/applications/graphics/darktable/1.2rc1.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ stdenv, fetchurl -, GConf, atk, cairo, cmake, curl, dbus_glib, exiv2, glib -, libgnome_keyring, gphoto2, gtk, ilmbase, intltool, lcms, lcms2 -, lensfun, libXau, libXdmcp, libexif, libglade, libgphoto2, libjpeg -, libpng, libpthreadstubs, libraw1394, librsvg, libtiff, libxcb -, openexr, pixman, pkgconfig, sqlite, bash, libxslt }: - -assert stdenv ? glibc; - -stdenv.mkDerivation rec { - version = "1.2rc1"; - name = "darktable-${version}"; - - src = fetchurl { - url = "http://tinyurl.com/bmwdztq"; - name = "${name}-${version}.tar.xz"; - sha256 = "0l3gl49bmaljrrl4zfaivvj7apxa2jm934ylq24gcms3b2whv70m"; - }; - - buildInputs = - [ GConf atk cairo cmake curl dbus_glib exiv2 glib libgnome_keyring gtk - ilmbase intltool lcms lcms2 lensfun libXau libXdmcp libexif - libglade libgphoto2 libjpeg libpng libpthreadstubs libraw1394 - librsvg libtiff libxcb openexr pixman pkgconfig sqlite libxslt - ]; - - 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" - - substituteInPlace tools/create_preferences.sh.in --replace '#!/usr/bin/env bash' '#!${bash}/bin/bash' - ''; - - cmakeFlags = [ - "-DPTHREAD_INCLUDE_DIR=${stdenv.glibc}/include" - "-DPTHREAD_LIBRARY=${stdenv.glibc}/lib/libpthread.so" - "-DCMAKE_BUILD_TYPE=Release" - "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib}/lib/glib-2.0/include" - "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk}/lib/gtk-2.0/include" - ]; - - meta = with stdenv.lib; { - description = "Virtual lighttable and darkroom for photographers"; - homepage = http://darktable.sourceforge.net; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = [ maintainers.goibhniu ]; - }; -} diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index aa67406d0e7..91c91dc3925 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -8,12 +8,12 @@ assert stdenv ? glibc; stdenv.mkDerivation rec { - version = "1.1.4"; + version = "1.2"; name = "darktable-${version}"; src = fetchurl { - url = "mirror://sourceforge/darktable/darktable/1.1/darktable-${version}.tar.xz"; - sha256 = "1bzcxh8zm0xxrpifkkksv9k4xagjrzlam00yja9v9cbjlvawfszv"; + url = "mirror://sourceforge/darktable/darktable/1.2/darktable-${version}.tar.xz"; + sha256 = "0l2lrly46nda7b2y4gskqqxaajia34g487bgjcpd5ysxbhmmhlnw"; }; buildInputs = diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5feb863ecb1..0e6acb7905b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6735,10 +6735,6 @@ let inherit (gnome) GConf libglade; }; - darktable12 = callPackage ../applications/graphics/darktable/1.2rc1.nix { - inherit (gnome) GConf libglade; - }; - "dd-agent" = callPackage ../tools/networking/dd-agent { }; dia = callPackage ../applications/graphics/dia {