fix evaluation on non-Linux, should fix tarball
This commit is contained in:
parent
0f7e530c9d
commit
afdc7fdfb6
@ -9,14 +9,15 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [ libpthreadstubs libpciaccess udev ];
|
||||
buildInputs = [ libpthreadstubs libpciaccess ]
|
||||
++ stdenv.lib.optional stdenv.isLinux udev;
|
||||
|
||||
patches = stdenv.lib.optional stdenv.isDarwin ./libdrm-apple.patch;
|
||||
|
||||
preConfigure = stdenv.lib.optionalString stdenv.isDarwin
|
||||
"echo : \\\${ac_cv_func_clock_gettime=\'yes\'} > config.cache";
|
||||
|
||||
configureFlags = [ "--enable-udev" ]
|
||||
configureFlags = stdenv.lib.optional stdenv.isLinux "--enable-udev"
|
||||
++ stdenv.lib.optional stdenv.isDarwin "-C";
|
||||
|
||||
crossAttrs.configureFlags = configureFlags ++ [ "--disable-intel" ];
|
||||
|
@ -3,6 +3,8 @@
|
||||
, glib, kbd, libxslt, coreutils, libgcrypt, sysvtools, docbook_xsl
|
||||
}:
|
||||
|
||||
assert stdenv.isLinux;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "203";
|
||||
name = "systemd-${version}";
|
||||
@ -24,7 +26,7 @@ stdenv.mkDerivation rec {
|
||||
./0009-Start-ctrl-alt-del.target-irreversibly.patch
|
||||
] ++ stdenv.lib.optional stdenv.isArm ./libc-bug-accept4-arm.patch;
|
||||
|
||||
buildInputs = assert stdenv.gcc.libc or null != null; # assertion here, so it doesn't trigger on passthru.headers
|
||||
buildInputs =
|
||||
[ pkgconfig intltool gperf libcap dbus.libs kmod xz pam acl
|
||||
/* cryptsetup */ libuuid m4 glib libxslt libgcrypt docbook_xsl
|
||||
];
|
||||
|
@ -4784,9 +4784,10 @@ let
|
||||
|
||||
mesaSupported = lib.elem system lib.platforms.mesaPlatforms;
|
||||
|
||||
mesa_original = callPackage ../development/libraries/mesa { };
|
||||
mesa_noglu = if stdenv.isDarwin then darwinX11AndOpenGL
|
||||
else callPackage ../development/libraries/mesa { };
|
||||
mesa_drivers = mesa_noglu.drivers;
|
||||
else mesa_original;
|
||||
mesa_drivers = mesa_original.drivers;
|
||||
mesa_glu = callPackage ../development/libraries/mesa-glu { };
|
||||
mesa = if stdenv.isDarwin then darwinX11AndOpenGL
|
||||
else buildEnv {
|
||||
|
Loading…
Reference in New Issue
Block a user