Merge commit staging+systemd into closure-size

Many non-conflict problems weren't (fully) resolved in this commit yet.
This commit is contained in:
Vladimír Čunát
2015-10-03 13:33:37 +02:00
6304 changed files with 708451 additions and 130034 deletions
@@ -1,11 +1,12 @@
{ stdenv, fetchurl, lcms2, jasper, pkgconfig }:
stdenv.mkDerivation rec {
name = "libraw-0.16.0";
name = "libraw-${version}";
version = "0.17.0";
src = fetchurl {
url = http://www.libraw.org/data/LibRaw-0.16.0.tar.gz;
sha256 = "15ng4s24grib39r0nlgrf18r2j9yh43qyx4vbif38d95xiqkix3i";
url = "http://www.libraw.org/data/LibRaw-${version}.tar.gz";
sha256 = "043kckxjqanw8dl3m9f6kvsf0l20ywxmgxd1xb0slj6m8l4w4hz6";
};
buildInputs = [ lcms2 jasper (stdenv.cc.cc.lib or null) ] ;
@@ -16,6 +17,7 @@ stdenv.mkDerivation rec {
description = "Library for reading RAW files obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, and others)";
homepage = http://www.libraw.org/;
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.all;
};
}