Merge commit staging+systemd into closure-size
Many non-conflict problems weren't (fully) resolved in this commit yet.
This commit is contained in:
@@ -1,16 +1,16 @@
|
||||
{ stdenv, fetchurl, pkgconfig, glib, libtiff, libjpeg, libpng, libX11
|
||||
, jasper, libintlOrEmpty, gobjectIntrospection }:
|
||||
, jasper, libintlOrEmpty, gobjectIntrospection, doCheck ? false }:
|
||||
|
||||
let
|
||||
ver_maj = "2.31";
|
||||
ver_min = "3";
|
||||
ver_maj = "2.32";
|
||||
ver_min = "0";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gdk-pixbuf-${ver_maj}.${ver_min}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gdk-pixbuf/${ver_maj}/${name}.tar.xz";
|
||||
sha256 = "ddd861747bb7c580acce7cfa3ce38c3f52a9516e66a6477988fd100c8fb9eabc";
|
||||
sha256 = "0rqvj5gcs2zfyyg9llm289b0xkj4mrhzxfjpjja0wx1m6vn5axjk";
|
||||
};
|
||||
|
||||
outputs = [ "dev" "out" "bin" "doc" ];
|
||||
@@ -30,7 +30,8 @@ stdenv.mkDerivation rec {
|
||||
+ stdenv.lib.optionalString (gobjectIntrospection != null) " --enable-introspection=yes"
|
||||
;
|
||||
|
||||
doCheck = true;
|
||||
# The tests take an excessive amount of time (> 1.5 hours) and memory (> 6 GB).
|
||||
inherit (doCheck);
|
||||
|
||||
# propagate the bin output
|
||||
postPhases = "postPostFixup";
|
||||
|
||||
Reference in New Issue
Block a user