Merge pull request #113265 from SuperSandro2000/fix-collection13

This commit is contained in:
Sandro
2021-02-17 03:14:49 +01:00
committed by GitHub
62 changed files with 119 additions and 193 deletions
+2 -2
View File
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, pkg-config, zlib, kmod, which
, static ? stdenv.hostPlatform.isStatic
, darwin ? null
, IOKit
}:
stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config ];
buildInputs = [ zlib kmod which ] ++
lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.IOKit;
lib.optional stdenv.hostPlatform.isDarwin IOKit;
preConfigure = if stdenv.cc.isGNU then null else ''
substituteInPlace Makefile --replace 'CC=$(CROSS_COMPILE)gcc' ""