about summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorMichael Raskin <7c6f434c@mail.ru>2008-06-15 11:39:54 +0000
committerMichael Raskin <7c6f434c@mail.ru>2008-06-15 11:39:54 +0000
commit74cb80f8fa73e4e65fca8f9c28a79ebaabaf93fe (patch)
treee0e3ca81ba1ff3d9a28ed59d71f8b94e1930451c /pkgs/top-level
parentfaba06ce549950a2fe20bd152263a2eedd0e2d34 (diff)
downloadnixlib-74cb80f8fa73e4e65fca8f9c28a79ebaabaf93fe.tar
nixlib-74cb80f8fa73e4e65fca8f9c28a79ebaabaf93fe.tar.gz
nixlib-74cb80f8fa73e4e65fca8f9c28a79ebaabaf93fe.tar.bz2
nixlib-74cb80f8fa73e4e65fca8f9c28a79ebaabaf93fe.tar.lz
nixlib-74cb80f8fa73e4e65fca8f9c28a79ebaabaf93fe.tar.xz
nixlib-74cb80f8fa73e4e65fca8f9c28a79ebaabaf93fe.tar.zst
nixlib-74cb80f8fa73e4e65fca8f9c28a79ebaabaf93fe.zip
Uncommented ndiswrapper
svn path=/nixpkgs/trunk/; revision=12096
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix15
1 files changed, 8 insertions, 7 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6069f0d9d8d4..6a6ccfc578c5 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;
   };