diff options
| -rw-r--r-- | pkgs/applications/graphics/rawtherapee/default.nix | 14 | ||||
| -rw-r--r-- | pkgs/development/libraries/fftw/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
3 files changed, 12 insertions, 9 deletions
diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix index 328181790ac..bf7e2d30420 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 +, libXdmcp, lcms2, libiptcdata, libcanberra, fftw , 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 mercurial ]; + lcms2 libiptcdata mercurial libcanberra fftw ]; # 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; }; } diff --git a/pkgs/development/libraries/fftw/default.nix b/pkgs/development/libraries/fftw/default.nix index 6b4fbe7df6c..e096c5fa94f 100644 --- a/pkgs/development/libraries/fftw/default.nix +++ b/pkgs/development/libraries/fftw/default.nix @@ -1,4 +1,4 @@ -{fetchurl, stdenv, builderDefs, stringsWithDeps, singlePrecision ? false, pthreads ? false}: +{fetchurl, stdenv, builderDefs, stringsWithDeps, singlePrecision ? false, pthreads ? false, float ? false}: let version = "3.3.2"; localDefs = builderDefs.passthru.function { @@ -12,6 +12,7 @@ let # some distros seem to be shipping both versions within the same package? # why does --enable-float still result in ..3f.so instead of ..3.so? ++ (if singlePrecision then [ "--enable-single" ] else [ ]) + ++ (if float then [ "--enable-float" ] else [ ]) ++ (stdenv.lib.optional (!pthreads) "--enable-openmp") ++ (stdenv.lib.optional pthreads "--enable-threads") # I think all i686 has sse diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c4afbe4b9e2..c77296bec2a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7676,7 +7676,9 @@ let ratpoison = callPackage ../applications/window-managers/ratpoison { }; - rawtherapee = callPackage ../applications/graphics/rawtherapee { }; + rawtherapee = callPackage ../applications/graphics/rawtherapee { + fftw = fftw.override {float = true;}; + }; rcs = callPackage ../applications/version-management/rcs { }; |