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

* KVM 84. CIFS/Samba performance still broken.

Browse Source 
* Kernel headers: KVM expects a include/linux/asm-x86 symlink, so
  provide it.

svn path=/nixpkgs/trunk/; revision=14113
This commit is contained in:
Eelco Dolstra 2009-02-18 14:53:14 +00:00
parent 9f4ca51e8e
commit 539239d66d
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/os-specific/linux/kernel-headers/2.6.28.nix
View File

@ -20,9 +20,6 @@ stdenv.mkDerivation {
buildInputs = [perl]; buildInputs = [perl];
# !!! hacky
fixupPhase = "ln -s $out/include/asm $out/include/asm-$platform";
extraIncludeDirs = extraIncludeDirs =
if stdenv.system == "powerpc-linux" then ["ppc"] else []; if stdenv.system == "powerpc-linux" then ["ppc"] else [];
@ -41,4 +38,12 @@ stdenv.mkDerivation {
ensureDir $out/include/config ensureDir $out/include/config
echo "${version}-default" > $out/include/config/kernel.release echo "${version}-default" > $out/include/config/kernel.release
''; '';
# !!! hacky
fixupPhase = ''
ln -s asm $out/include/asm-$platform
if test "$platform" = "i386" -o "$platform" = "x86_64"; then
ln -s asm $out/include/asm-x86
fi
'';
} }

8
pkgs/os-specific/linux/kvm/82.nix → pkgs/os-specific/linux/kvm/84.nix
View File

@ -2,12 +2,12 @@
assert stdenv.isLinux; assert stdenv.isLinux;
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "kvm-82"; name = "kvm-84";
src = fetchurl { src = fetchurl {
url = mirror://sourceforge/kvm/kvm-82.tar.gz; url = "mirror://sourceforge/kvm/${name}.tar.gz";
sha256 = "1fk58g8z9v7z42vy76zq0sq28slqf8zszzmh73vyxm07vfbc96zs"; sha256 = "13lqhy4lpxqby7qj3l1cdbj73c7jmvkq73bc5wchwn0l0dkjsjlk";
}; };
patches = [ patches = [

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

@ -6985,7 +6985,7 @@ let
kernelHeaders = kernelHeaders_2_6_26; kernelHeaders = kernelHeaders_2_6_26;
}; };
kvm82 = import ../os-specific/linux/kvm/82.nix { kvm84 = import ../os-specific/linux/kvm/84.nix {
inherit fetchurl stdenv zlib e2fsprogs SDL alsaLib pkgconfig rsync; inherit fetchurl stdenv zlib e2fsprogs SDL alsaLib pkgconfig rsync;
kernelHeaders = kernelHeaders_2_6_28; kernelHeaders = kernelHeaders_2_6_28;
}; };