diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-02-15 15:54:57 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-02-15 15:54:57 +0000 |
| commit | 6ba53ec09a253b45757915e0f47fd6fd13f1e420 (patch) | |
| tree | c29fb31f6a29d817613cc6c19f3668f9a66c8a6e /pkgs/servers/x11/xorg/overrides.nix | |
| parent | a5aa96c3a38e3cb11c9666a5be5c7d9473c10a50 (diff) | |
| download | nixpkgs-6ba53ec09a253b45757915e0f47fd6fd13f1e420.tar nixpkgs-6ba53ec09a253b45757915e0f47fd6fd13f1e420.tar.gz nixpkgs-6ba53ec09a253b45757915e0f47fd6fd13f1e420.tar.bz2 nixpkgs-6ba53ec09a253b45757915e0f47fd6fd13f1e420.tar.lz nixpkgs-6ba53ec09a253b45757915e0f47fd6fd13f1e420.tar.xz nixpkgs-6ba53ec09a253b45757915e0f47fd6fd13f1e420.tar.zst nixpkgs-6ba53ec09a253b45757915e0f47fd6fd13f1e420.zip | |
* Fix xf86-input-synaptics and xf86-input-keyboard.
* Enable parallel building for all X.org packages. svn path=/nixpkgs/branches/x-updates/; revision=25982
Diffstat (limited to 'pkgs/servers/x11/xorg/overrides.nix')
| -rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 0ef2bf5f859..f1b0f64f02e 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -113,13 +113,13 @@ in }; 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 @@ in ]; propagatedBuildInputs = [ xorg.libpciaccess xorg.inputproto xorg.xextproto xorg.randrproto - xorg.dri2proto + xorg.dri2proto xorg.kbproto ]; postInstall = '' |