diff options
| author | John Ericson <Ericson2314@yahoo.com> | 2017-04-15 01:27:05 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-15 01:27:05 -0400 |
| commit | 3bff114d95da3c9f1d5a438c61cdc8b422676af3 (patch) | |
| tree | 6aa4f8d35671c609eb6749b6938c9a7e44d9030a /pkgs/os-specific | |
| parent | cdbcaa56b6dd06d2d7f215ccbcab966a9a902773 (diff) | |
| parent | f89504d06746f50d1b7915ad6b31fc58a3449541 (diff) | |
| download | nixlib-3bff114d95da3c9f1d5a438c61cdc8b422676af3.tar nixlib-3bff114d95da3c9f1d5a438c61cdc8b422676af3.tar.gz nixlib-3bff114d95da3c9f1d5a438c61cdc8b422676af3.tar.bz2 nixlib-3bff114d95da3c9f1d5a438c61cdc8b422676af3.tar.lz nixlib-3bff114d95da3c9f1d5a438c61cdc8b422676af3.tar.xz nixlib-3bff114d95da3c9f1d5a438c61cdc8b422676af3.tar.zst nixlib-3bff114d95da3c9f1d5a438c61cdc8b422676af3.zip | |
Merge pull request #24871 from elitak/cross-staging
Various small crossDrv fixes
Diffstat (limited to 'pkgs/os-specific')
| -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 138130fa82e4..5d0dca7b6bec 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 ]; |