public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

darktable: Update to 1.2

Browse Source
This commit is contained in:
Rickard Nilsson 2013-04-08 18:21:55 +02:00
parent 203fd72f8f
commit 1f82083c20
3 changed files with 3 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
pkgs/applications/graphics/darktable/1.2rc1.nix
View File

@ -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 ];
};
}

6
pkgs/applications/graphics/darktable/default.nix
View File

@ -8,12 +8,12 @@
assert stdenv ? glibc; assert stdenv ? glibc;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.1.4"; version = "1.2";
name = "darktable-${version}"; name = "darktable-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/darktable/darktable/1.1/darktable-${version}.tar.xz"; url = "mirror://sourceforge/darktable/darktable/1.2/darktable-${version}.tar.xz";
sha256 = "1bzcxh8zm0xxrpifkkksv9k4xagjrzlam00yja9v9cbjlvawfszv"; sha256 = "0l2lrly46nda7b2y4gskqqxaajia34g487bgjcpd5ysxbhmmhlnw";
}; };
buildInputs = buildInputs =

4
pkgs/top-level/all-packages.nix
View File

@ -6735,10 +6735,6 @@ let
inherit (gnome) GConf libglade; inherit (gnome) GConf libglade;
}; };
darktable12 = callPackage ../applications/graphics/darktable/1.2rc1.nix {
inherit (gnome) GConf libglade;
};
"dd-agent" = callPackage ../tools/networking/dd-agent { }; "dd-agent" = callPackage ../tools/networking/dd-agent { };
dia = callPackage ../applications/graphics/dia { dia = callPackage ../applications/graphics/dia {