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

* Fix xf86-input-synaptics and xf86-input-keyboard.

Browse Source 
* Enable parallel building for all X.org packages.

svn path=/nixpkgs/branches/x-updates/; revision=25982
This commit is contained in:
Eelco Dolstra 2011-02-15 15:54:57 +00:00
parent a5aa96c3a3
commit 6ba53ec09a
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/servers/x11/xorg/builder.sh
View File

@ -38,7 +38,7 @@ postInstall() {
} }
installFlags="appdefaultdir=$out/share/X11/app-defaults" installFlags="appdefaultdir=$out/share/X11/app-defaults $installFlags"
if test -n "$x11BuildHook"; then if test -n "$x11BuildHook"; then
@ -46,4 +46,7 @@ if test -n "$x11BuildHook"; then
fi fi
enableParallelBuilding=1
genericBuild genericBuild

6
pkgs/servers/x11/xorg/overrides.nix
View File

@ -113,13 +113,13 @@ in
}; };
xf86inputevdev = attrs: attrs // { xf86inputevdev = attrs: attrs // {
configureFlags = "--with-sdkdir=\${out}/include/xorg";
preBuild = "sed -e '/motion_history_proc/d; /history_size/d;' -i src/*.c"; preBuild = "sed -e '/motion_history_proc/d; /history_size/d;' -i src/*.c";
buildInputs = attrs.buildInputs ++ [xorg.kbproto xorg.libxkbfile xorg.randrproto]; buildInputs = attrs.buildInputs ++ [xorg.kbproto xorg.libxkbfile xorg.randrproto];
installFlags = "sdkdir=\${out}/include/xorg";
}; };
xf86inputsynaptics = attrs: attrs // { xf86inputsynaptics = attrs: attrs // {
makeFlags = "sdkdir=\${out}/include/xorg"; installFlags = "sdkdir=\${out}/include/xorg configdir=\${out}/include/xorg";
}; };
xf86videointel = attrs: attrs // { xf86videointel = attrs: attrs // {
@ -166,7 +166,7 @@ in
]; ];
propagatedBuildInputs = propagatedBuildInputs =
[ xorg.libpciaccess xorg.inputproto xorg.xextproto xorg.randrproto [ xorg.libpciaccess xorg.inputproto xorg.xextproto xorg.randrproto
xorg.dri2proto xorg.dri2proto xorg.kbproto
]; ];
postInstall = postInstall =
'' ''