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

Fixing the aufs evaluation errors.

Browse Source 
svn path=/nixpkgs/trunk/; revision=22361
This commit is contained in:
Lluís Batlle i Rossell 2010-06-21 17:51:52 +00:00
parent b39389560f
commit 0e125635ed
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6444,14 +6444,6 @@ let
inherit fetchurl stdenv kernel; inherit fetchurl stdenv kernel;
}; };
aufs2 = import ../os-specific/linux/aufs2 {
inherit fetchurl stdenv kernel perl;
};
aufs2_util = import ../os-specific/linux/aufs2-util {
inherit fetchurl stdenv kernel aufs2;
};
blcr = import ../os-specific/linux/blcr/0.8.2.nix { blcr = import ../os-specific/linux/blcr/0.8.2.nix {
inherit fetchurl stdenv kernel perl makeWrapper; inherit fetchurl stdenv kernel perl makeWrapper;
}; };
@ -6556,7 +6548,15 @@ let
inherit stdenv fetchurl lib patchelf cdrkit kernel; inherit stdenv fetchurl lib patchelf cdrkit kernel;
inherit (xlibs) libX11 libXt libXext libXmu libXcomposite libXfixes; inherit (xlibs) libX11 libXt libXext libXmu libXcomposite libXfixes;
}; };
}; } // (if kernel.features ? aufsBase then rec {
aufs2 = import ../os-specific/linux/aufs2 {
inherit fetchurl stdenv kernel perl;
};
aufs2_util = import ../os-specific/linux/aufs2-util {
inherit fetchurl stdenv kernel aufs2;
};
} else {});
# Build the kernel modules for the some of the kernels. # Build the kernel modules for the some of the kernels.
linuxPackages_2_6_25 = recurseIntoAttrs (linuxPackagesFor linux_2_6_25); linuxPackages_2_6_25 = recurseIntoAttrs (linuxPackagesFor linux_2_6_25);
@ -8482,7 +8482,7 @@ let
}; };
pinta = import ../applications/graphics/pinta { pinta = import ../applications/graphics/pinta {
inherit fetchgit stdenv mono pkgconfig automake autoconf; inherit fetchgit stdenv mono pkgconfig;
gtksharp = gtksharp2; gtksharp = gtksharp2;
}; };