Merge staging into closure-size

This commit is contained in:
Vladimír Čunát
2015-05-05 11:49:03 +02:00
869 changed files with 36249 additions and 30352 deletions
+2 -2
View File
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, intltool, gperf, libcap, dbus, kmod
, zlib, xz, pam, acl, cryptsetup, libuuid, m4, utillinux, libffi
, glib, kbd, libxslt, coreutils, libgcrypt, sysvtools
, glib, kbd, libxslt, coreutils, libgcrypt
, kexectools, libmicrohttpd, linuxHeaders
, pythonPackages ? null, pythonSupport ? false
}:
@@ -80,7 +80,7 @@ stdenv.mkDerivation rec {
--replace /sbin/fsck ${utillinux.bin}/sbin/fsck \
--replace /bin/echo ${coreutils}/bin/echo \
--replace /bin/cat ${coreutils}/bin/cat \
--replace /sbin/sulogin ${sysvtools}/sbin/sulogin \
--replace /sbin/sulogin ${utillinux}/sbin/sulogin \
--replace /sbin/kexec ${kexectools}/sbin/kexec
done