diff options
author | Shea Levy <shea@shealevy.com> | 2016-08-15 19:05:52 -0400 |
---|---|---|
committer | Shea Levy <shea@shealevy.com> | 2016-08-15 19:05:52 -0400 |
commit | 9adad8612b082bcbae30c81678a04b79a44079a4 (patch) | |
tree | 6814d056ee2960d122842dc9c830bb411c40d5ff /pkgs/os-specific/linux/kmod/default.nix | |
parent | 57b2d1e9b0dcdd1d25bd2d450174764b9417ffc1 (diff) |
Revert "Merge branch 'modprobe-fix' of git://github.com/abbradar/nixpkgs"
Was meant to go into staging, sorry This reverts commit 57b2d1e9b0dcdd1d25bd2d450174764b9417ffc1, reversing changes made to 760b2b9048ea775c319cb348d74447a20dea513e.
Diffstat (limited to 'pkgs/os-specific/linux/kmod/default.nix')
-rw-r--r-- | pkgs/os-specific/linux/kmod/default.nix | 30 |
1 files changed, 9 insertions, 21 deletions
diff --git a/pkgs/os-specific/linux/kmod/default.nix b/pkgs/os-specific/linux/kmod/default.nix index 58b0b9883512e..12449a0a7ddab 100644 --- a/pkgs/os-specific/linux/kmod/default.nix +++ b/pkgs/os-specific/linux/kmod/default.nix @@ -1,37 +1,25 @@ -{ stdenv, lib, fetchurl, autoreconfHook, xz, zlib, pkgconfig, libxslt }: +{ stdenv, fetchurl, xz, zlib, pkgconfig, libxslt }: -let - systems = [ "current-system" "booted-system" ]; - modulesDirs = lib.concatMapStringsSep ":" (x: "/run/${x}/kernel-modules/lib/modules") systems; - -in stdenv.mkDerivation rec { - name = "kmod-${version}"; - version = "22"; +stdenv.mkDerivation rec { + name = "kmod-22"; src = fetchurl { url = "mirror://kernel/linux/utils/kernel/kmod/${name}.tar.xz"; sha256 = "10lzfkmnpq6a43a3gkx7x633njh216w0bjwz31rv8a1jlgg1sfxs"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig libxslt ]; - buildInputs = [ xz /* zlib */ ]; + buildInputs = [ pkgconfig libxslt xz /* zlib */ ]; - configureFlags = [ - "--sysconfdir=/etc" - "--with-xz" - "--with-modulesdirs=${modulesDirs}" - # "--with-zlib" - ]; + configureFlags = [ "--sysconfdir=/etc" "--with-xz" /* "--with-zlib" */ ]; patches = [ ./module-dir.patch ]; postInstall = '' - for prog in rmmod insmod lsmod modinfo modprobe depmod; do - ln -sv $out/bin/kmod $out/bin/$prog + ln -s kmod $out/bin/lsmod + mkdir -p $out/sbin + for prog in rmmod insmod modinfo modprobe depmod; do + ln -sv $out/bin/kmod $out/sbin/$prog done - - # Backwards compatibility - ln -s bin $out/sbin ''; meta = { |