diff options
| author | Peter Simons <simons@cryp.to> | 2011-10-06 09:37:22 +0000 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2011-10-06 09:37:22 +0000 |
| commit | 1abdc56a124b0c55f6929f5ab663a32f65e1c6e2 (patch) | |
| tree | cb32e33942cc5898a4896d463fb3ff33b1c61fc8 /pkgs/os-specific/linux/module-init-tools/default.nix | |
| parent | f74e361e453e8d96dda1ffc4323ad7fe5cd93f7b (diff) | |
| parent | dce7ac1f10ea1b94fb82ed3bbb14635f5f430b6e (diff) | |
Synchronized stdenv-updates branch with trunk.
There were conflicting patches of pkgs/os-specific/linux/module-init-tools. Apparently, the expression was updated independently in both branches. I've resolved the conflict by preferring the patches from stdenv-updates, because those patches appeared to be more sophisticated, i.e. they build the manual, etc. svn path=/nixpkgs/branches/stdenv-updates/; revision=29680
Diffstat (limited to 'pkgs/os-specific/linux/module-init-tools/default.nix')
| -rw-r--r-- | pkgs/os-specific/linux/module-init-tools/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/module-init-tools/default.nix b/pkgs/os-specific/linux/module-init-tools/default.nix index 003ee1263f85b..fc716469a49cb 100644 --- a/pkgs/os-specific/linux/module-init-tools/default.nix +++ b/pkgs/os-specific/linux/module-init-tools/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{stdenv, fetchurl, docbook2x}: stdenv.mkDerivation { name = "module-init-tools-3.16"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { }) ]; - patches = [./module-dir.patch]; + patches = [ ./module-dir.patch ./docbook2man.patch ]; postInstall = "rm $out/sbin/insmod.static"; # don't need it |