diff options
| author | Eric Litak <elitak@gmail.com> | 2017-02-07 09:17:28 -0800 |
|---|---|---|
| committer | Eric Litak <elitak@gmail.com> | 2017-04-14 18:03:49 -0700 |
| commit | f89504d06746f50d1b7915ad6b31fc58a3449541 (patch) | |
| tree | c93ef774486b505983a30ba9cd5af95fb6d6f535 /pkgs/os-specific/linux/kmod | |
| parent | 980ced505fd4da90ae75d1582da6825ef51476c1 (diff) | |
| download | nixpkgs-f89504d06746f50d1b7915ad6b31fc58a3449541.tar nixpkgs-f89504d06746f50d1b7915ad6b31fc58a3449541.tar.gz nixpkgs-f89504d06746f50d1b7915ad6b31fc58a3449541.tar.bz2 nixpkgs-f89504d06746f50d1b7915ad6b31fc58a3449541.tar.lz nixpkgs-f89504d06746f50d1b7915ad6b31fc58a3449541.tar.xz nixpkgs-f89504d06746f50d1b7915ad6b31fc58a3449541.tar.zst nixpkgs-f89504d06746f50d1b7915ad6b31fc58a3449541.zip | |
kmod: crossDrv should use native xz
Diffstat (limited to 'pkgs/os-specific/linux/kmod')
| -rw-r--r-- | pkgs/os-specific/linux/kmod/default.nix | 7 |
1 files 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 ]; |