nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 07:23:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

rawtherapee-4.0.10 . Add a 'float' option to fftw, as this version of rawtherapee requires it.

Browse Source
This commit is contained in:
Jack Cummings 2013-03-31 21:33:21 -07:00
parent 98ba667094
commit 437419a124
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/applications/graphics/rawtherapee/default.nix
View File

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

3
pkgs/development/libraries/fftw/default.nix
View File

@ -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

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

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