From f89504d06746f50d1b7915ad6b31fc58a3449541 Mon Sep 17 00:00:00 2001 From: Eric Litak Date: Tue, 7 Feb 2017 09:17:28 -0800 Subject: [PATCH] kmod: crossDrv should use native xz --- pkgs/os-specific/linux/kmod/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kmod/default.nix b/pkgs/os-specific/linux/kmod/default.nix index 138130fa82e..5d0dca7b6be 100644 --- a/pkgs/os-specific/linux/kmod/default.nix +++ b/pkgs/os-specific/linux/kmod/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, autoreconfHook, xz, zlib, pkgconfig, libxslt }: +{ stdenv, buildPackages, lib, fetchurl, autoreconfHook, pkgconfig, libxslt, xz }: let systems = [ "/run/current-system/kernel-modules" "/run/booted-system/kernel-modules" "" ]; @@ -14,13 +14,14 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook pkgconfig libxslt ]; - buildInputs = [ xz /* zlib */ ]; + buildInputs = [ xz ]; + # HACK until BUG issue #21191 is addressed + crossAttrs.preUnpack = ''PATH="${buildPackages.xz}/bin''${PATH:+:}$PATH"''; configureFlags = [ "--sysconfdir=/etc" "--with-xz" "--with-modulesdirs=${modulesDirs}" - # "--with-zlib" ]; patches = [ ./module-dir.patch ];