Author: eelco
Date: Tue Feb 15 15:54:57 2011
New Revision: 25982
URL: https://svn.nixos.org/websvn/nix/?rev=25982&sc=1
Log:
* Fix xf86-input-synaptics and xf86-input-keyboard.
* Enable parallel building for all X.org packages.
Modified:
nixpkgs/branches/x-updates/pkgs/servers/x11/xorg/builder.sh
nixpkgs/branches/x-updates/pkgs/servers/x11/xorg/overrides.nix
Modified: nixpkgs/branches/x-updates/pkgs/servers/x11/xorg/builder.sh
==============================================================================
--- nixpkgs/branches/x-updates/pkgs/servers/x11/xorg/builder.sh Tue Feb 15
15:04:17 2011 (r25981)
+++ nixpkgs/branches/x-updates/pkgs/servers/x11/xorg/builder.sh Tue Feb 15
15:54:57 2011 (r25982)
@@ -38,12 +38,15 @@
}
-installFlags="appdefaultdir=$out/share/X11/app-defaults"
+installFlags="appdefaultdir=$out/share/X11/app-defaults $installFlags"
if test -n "$x11BuildHook"; then
source $x11BuildHook
-fi
+fi
+
+
+enableParallelBuilding=1
genericBuild
Modified: nixpkgs/branches/x-updates/pkgs/servers/x11/xorg/overrides.nix
==============================================================================
--- nixpkgs/branches/x-updates/pkgs/servers/x11/xorg/overrides.nix Tue Feb
15 15:04:17 2011 (r25981)
+++ nixpkgs/branches/x-updates/pkgs/servers/x11/xorg/overrides.nix Tue Feb
15 15:54:57 2011 (r25982)
@@ -113,13 +113,13 @@
};
xf86inputevdev = attrs: attrs // {
- configureFlags = "--with-sdkdir=\${out}/include/xorg";
preBuild = "sed -e '/motion_history_proc/d; /history_size/d;' -i src/*.c";
buildInputs = attrs.buildInputs ++ [xorg.kbproto xorg.libxkbfile
xorg.randrproto];
+ installFlags = "sdkdir=\${out}/include/xorg";
};
xf86inputsynaptics = attrs: attrs // {
- makeFlags = "sdkdir=\${out}/include/xorg";
+ installFlags = "sdkdir=\${out}/include/xorg
configdir=\${out}/include/xorg";
};
xf86videointel = attrs: attrs // {
@@ -166,7 +166,7 @@
];
propagatedBuildInputs =
[ xorg.libpciaccess xorg.inputproto xorg.xextproto xorg.randrproto
- xorg.dri2proto
+ xorg.dri2proto xorg.kbproto
];
postInstall =
''
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
