public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix aufs utilities for NixOS manual

Browse Source 
svn path=/nixpkgs/trunk/; revision=17153
This commit is contained in:
Michael Raskin 2009-09-15 10:28:40 +00:00
parent af269992e1
commit 0428a7405a
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/os-specific/linux/aufs2-utils/default.nix
View File

@ -1,6 +1,4 @@
a : a :
if (a.lib.attrByPath ["features" "zen"] false a.kernel) ||
(a.lib.attrByPath ["features" "aufs"] false a.kernel) then
let let
s = import ./src-for-default.nix; s = import ./src-for-default.nix;
buildInputs = with a; [ buildInputs = with a; [
@ -35,4 +33,3 @@ rec {
linux; linux;
}; };
} }
else throw "Kernel doesn't support AUFS"

1
pkgs/os-specific/linux/zen-kernel/2.6.31-zen0.nix
View File

@ -12,6 +12,7 @@ in
iwlwifi = true; iwlwifi = true;
zen = true; zen = true;
fbConDecor = true; fbConDecor = true;
aufs = true;
}; };
extraMeta = { extraMeta = {

6
pkgs/top-level/all-packages.nix
View File

@ -5357,9 +5357,11 @@ let
inherit fetchgit stdenv kernel perl; inherit fetchgit stdenv kernel perl;
}; };
aufs2Utils = builderDefsPackage ../os-specific/linux/aufs2-utils { aufs2Utils = if kernel.features ? aufs then
builderDefsPackage ../os-specific/linux/aufs2-utils {
inherit kernel; inherit kernel;
}; }
else null;
exmap = import ../os-specific/linux/exmap { exmap = import ../os-specific/linux/exmap {
inherit fetchurl stdenv kernel boost pcre pkgconfig; inherit fetchurl stdenv kernel boost pcre pkgconfig;