public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kmod: crossDrv should use native xz

Browse Source
This commit is contained in:
Eric Litak 2017-02-07 09:17:28 -08:00
parent 980ced505f
commit f89504d067
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/os-specific/linux/kmod/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, autoreconfHook, xz, zlib, pkgconfig, libxslt }: { stdenv, buildPackages, lib, fetchurl, autoreconfHook, pkgconfig, libxslt, xz }:
let let
systems = [ "/run/current-system/kernel-modules" "/run/booted-system/kernel-modules" "" ]; systems = [ "/run/current-system/kernel-modules" "/run/booted-system/kernel-modules" "" ];
@ -14,13 +14,14 @@ in stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ autoreconfHook pkgconfig libxslt ]; 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 = [ configureFlags = [
"--sysconfdir=/etc" "--sysconfdir=/etc"
"--with-xz" "--with-xz"
"--with-modulesdirs=${modulesDirs}" "--with-modulesdirs=${modulesDirs}"
# "--with-zlib"
]; ];
patches = [ ./module-dir.patch ]; patches = [ ./module-dir.patch ];