diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-04-04 21:43:11 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-04-04 21:43:40 +0200 |
| commit | eb2e46aab26600484bfabb3c242bdd069279bdb1 (patch) | |
| tree | 18ec0523bfcd0967f8eef326756f96dc0075789a /pkgs/applications/graphics/rawtherapee | |
| parent | 16f45507619b4c4012bb7958fba09eb3bdc5ac87 (diff) | |
| parent | 22d4472d2744639ccd880f015bb3147cf5222f07 (diff) | |
Merge branch 'master' into x-updates
Conflicts:
pkgs/applications/graphics/rawtherapee/default.nix
pkgs/applications/misc/blender/default.nix
pkgs/applications/networking/browsers/chromium/sources.nix
pkgs/os-specific/linux/kernel/linux-3.9.nix
pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/applications/graphics/rawtherapee')
| -rw-r--r-- | pkgs/applications/graphics/rawtherapee/default.nix | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix index 67723dd5818..34ad7821c87 100644 --- a/pkgs/applications/graphics/rawtherapee/default.nix +++ b/pkgs/applications/graphics/rawtherapee/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchurl, pkgconfig, gtk, cmake, pixman, libpthreadstubs, gtkmm, libXau -, libXdmcp, lcms2, libiptcdata, expat +, libXdmcp, lcms2, libiptcdata, libcanberra, fftw, expat , mercurial # Not really needed for anything, but it fails if it does not find 'hg' }: stdenv.mkDerivation rec { - name = "rawtherapee-4.0.9"; + name = "rawtherapee-4.0.10"; src = fetchurl { - url = http://rawtherapee.googlecode.com/files/rawtherapee-4.0.9.tar.xz; - sha256 = "1ll7n7gzxs00jpw3gp9xfr90lbwqafkgqpps3j5ig6mf79frpm2a"; + url = http://rawtherapee.googlecode.com/files/rawtherapee-4.0.10.tar.xz; + sha256 = "1ibsdm2kqpw796rcdihnnp67vx0wm1d1bnlzq269r9p01w5s102g"; }; buildInputs = [ pkgconfig gtk cmake pixman libpthreadstubs gtkmm libXau libXdmcp - lcms2 libiptcdata expat mercurial ]; + lcms2 libiptcdata mercurial libcanberra fftw expat ]; # Disable the use of the RAWZOR propietary libraries cmakeFlags = [ "-DWITH_RAWZOR=OFF" ]; @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { meta = { description = "RAW converter and digital photo processing software"; homepage = http://www.rawtherapee.com/; - license = "GPLv3+"; - maintainers = with stdenv.lib.maintainers; [viric]; + license = stdenv.lib.licenses.gpl3Plus; + maintainers = with stdenv.lib.maintainers; [viric jcumming]; platforms = with stdenv.lib.platforms; linux; }; } |