public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into x-updates

Browse Source 
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
This commit is contained in:
Vladimír Čunát
2013-04-04 21:43:40 +02:00
parent 16f4550761 22d4472d27
commit eb2e46aab2
1110 changed files with 13883 additions and 13920 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/graphics/rawtherapee/default.nix
+7 -7
View File
@@ -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;
};
}