From 80f8b2cfbd2cffa2e8e2b4d9fcde9745ac99d835 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 2 Feb 2014 09:41:39 +0100 Subject: [PATCH] kmod-blacklist-ubuntu: fix references to binaries --- .../linux/kmod-blacklist-ubuntu/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix index 579944209356..682c36401de8 100644 --- a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix +++ b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, gnugrep, findutils }: let version = "3ubuntu1"; # Saucy in @@ -16,9 +16,14 @@ stdenv.mkDerivation { echo "''\n''\n## file: "`basename "$f"`"''\n''\n" >> "$out"/modprobe.conf cat "$f" >> "$out"/modprobe.conf done - ''; - #TODO: iwlwifi.conf has some strange references + substituteInPlace "$out"/modprobe.conf \ + --replace /sbin/lsmod /run/booted-system/sw/bin/lsmod \ + --replace /sbin/rmmod /run/booted-system/sw/sbin/rmmod \ + --replace /sbin/modprobe /run/booted-system/sw/sbin/modprobe \ + --replace " grep " " ${gnugrep}/bin/grep " \ + --replace " xargs " " ${findutils}/bin/xargs " + ''; meta = { homepage = http://packages.ubuntu.com/source/saucy/kmod;