diff options
| author | Peter Simons <simons@cryp.to> | 2012-10-10 18:46:48 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2012-10-10 18:46:48 +0200 |
| commit | 6ff829f19df8b414960081a656e055bb9952c86f (patch) | |
| tree | 70067a0ff11bd16b73c5c16aeb4257218a96d638 /pkgs/applications/graphics | |
| parent | 7dd1e71c2e646cdc951df72f17607d0c98a8a79f (diff) | |
| parent | c35a43315c20708ce79f1e306160e8e90e4cbe75 (diff) | |
| download | nixlib-6ff829f19df8b414960081a656e055bb9952c86f.tar nixlib-6ff829f19df8b414960081a656e055bb9952c86f.tar.gz nixlib-6ff829f19df8b414960081a656e055bb9952c86f.tar.bz2 nixlib-6ff829f19df8b414960081a656e055bb9952c86f.tar.lz nixlib-6ff829f19df8b414960081a656e055bb9952c86f.tar.xz nixlib-6ff829f19df8b414960081a656e055bb9952c86f.tar.zst nixlib-6ff829f19df8b414960081a656e055bb9952c86f.zip | |
Merge branch 'master' into x-updates
Diffstat (limited to 'pkgs/applications/graphics')
| -rw-r--r-- | pkgs/applications/graphics/darktable/default.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index 4d3b1a12b62b..15d7042e7dd8 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -3,17 +3,17 @@ , 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 }: +, openexr, pixman, pkgconfig, sqlite, bash }: assert stdenv ? glibc; stdenv.mkDerivation rec { - version = "1.0"; + version = "1.0.5"; name = "darktable-${version}"; src = fetchurl { url = "mirror://sourceforge/darktable/darktable-${version}.tar.gz"; - sha256 = "0wjv2x62kf25db61ivbn8y8xr9hr8hdlcjq6l1qxfqn2bn8a3qkm"; + sha256 = "0c18530446d2f2459fe533a1ef6fc2711300efe7466f36c23168ec2230fb5fbd"; }; buildInputs = @@ -30,6 +30,8 @@ stdenv.mkDerivation rec { 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 = [ |