From 6389fcdbde81030aa51cccfa425be2930583326b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 2 Jul 2012 20:10:10 +0200 Subject: [PATCH] rawtherapee: updating it. It fixes its build. --- .../graphics/rawtherapee/default.nix | 30 ++++++------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix index 4b61ac740cb9..328181790ac1 100644 --- a/pkgs/applications/graphics/rawtherapee/default.nix +++ b/pkgs/applications/graphics/rawtherapee/default.nix @@ -1,35 +1,23 @@ -{ stdenv, fetchsvn, pkgconfig, gtk, cmake, pixman, libpthreadstubs, gtkmm, libXau, -libXdmcp, lcms, libiptcdata +{ stdenv, fetchurl, pkgconfig, gtk, cmake, pixman, libpthreadstubs, gtkmm, libXau +, libXdmcp, lcms2, libiptcdata +, mercurial # Not really needed for anything, but it fails if it does not find 'hg' }: stdenv.mkDerivation rec { - name = "rawtherapee-svn-25"; + name = "rawtherapee-4.0.9"; - src = fetchsvn { - url = "http://rawtherapee.googlecode.com/svn/trunk"; - rev = 25; - sha256 = "09jg47rs09lly70x1zlrb3qcwi2rry1m7gjzs39iqzp53hi9j9mh"; + src = fetchurl { + url = http://rawtherapee.googlecode.com/files/rawtherapee-4.0.9.tar.xz; + sha256 = "1ll7n7gzxs00jpw3gp9xfr90lbwqafkgqpps3j5ig6mf79frpm2a"; }; buildInputs = [ pkgconfig gtk cmake pixman libpthreadstubs gtkmm libXau libXdmcp - lcms libiptcdata ]; - - # Rawtherapee died if the default setting for the icc directory pointed to a - # non existant place - patchPhase = '' - sed -i s,/usr/share/color/icc,/tmp/, rtgui/options.cc - ''; + lcms2 libiptcdata mercurial ]; # Disable the use of the RAWZOR propietary libraries cmakeFlags = [ "-DWITH_RAWZOR=OFF" ]; - installPhase = '' - mkdir -p $out/bin $out/lib - cp rtgui/rt $out/bin - # Weird kind of path reference - cp -r ../release/* $out/bin - cp rtengine/*.so $out/lib - ''; + enableParallelBuilding = true; meta = { description = "RAW converter and digital photo processing software";