From 74cb80f8fa73e4e65fca8f9c28a79ebaabaf93fe Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 15 Jun 2008 11:39:54 +0000 Subject: [PATCH] Uncommented ndiswrapper svn path=/nixpkgs/trunk/; revision=12096 --- pkgs/top-level/all-packages.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6069f0d9d8d..6a6ccfc578c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4967,6 +4967,14 @@ let pkgs = rec { kernel_ext3cowpatched = kernel; }; + /* compiles but has to be integrated into the kernel somehow + Let's have it uncommented and finish it.. + */ + ndiswrapper = import ../os-specific/linux/ndiswrapper { + inherit fetchurl stdenv; + inherit kernel; + }; + ov511 = import ../os-specific/linux/ov511 { inherit fetchurl kernel; stdenv = overrideGCC stdenv gcc34; @@ -5110,13 +5118,6 @@ let pkgs = rec { stdenv = overrideGCC stdenv gcc34; }; - /* compiles but has to be integrated into the kernel somehow - ndiswrapper = import ../os-specific/linux/ndiswrapper { - inherit fetchurl stdenv; - inherit kernel; - }; - */ - nettools = import ../os-specific/linux/net-tools { inherit fetchurl stdenv; };