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:13 +02:00
6304 changed files with 708456 additions and 130039 deletions

View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, autoreconfHook, unzip, xlibs, libjpeg }:
{ stdenv, fetchurl, unzip, libjpeg }:
stdenv.mkDerivation rec {
name = "jasper-1.900.1";
@@ -17,6 +17,7 @@ stdenv.mkDerivation rec {
./jasper-CVE-2014-9029.diff
];
# outputs TODO: why reconf
nativeBuildInputs = [ unzip autoreconfHook ];
propagatedBuildInputs = [ libjpeg ];