about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMichael Raskin <7c6f434c@mail.ru>2010-10-14 10:51:52 +0000
committerMichael Raskin <7c6f434c@mail.ru>2010-10-14 10:51:52 +0000
commitfada13658f6b66a10e8a97370eb141be04039b4d (patch)
treeeb428d69cb2e2755d0ececb6bb203f22b0396d37
parentbaf66467acc2b980579acb16d2fd0cb97883ad96 (diff)
downloadnixlib-fada13658f6b66a10e8a97370eb141be04039b4d.tar
nixlib-fada13658f6b66a10e8a97370eb141be04039b4d.tar.gz
nixlib-fada13658f6b66a10e8a97370eb141be04039b4d.tar.bz2
nixlib-fada13658f6b66a10e8a97370eb141be04039b4d.tar.lz
nixlib-fada13658f6b66a10e8a97370eb141be04039b4d.tar.xz
nixlib-fada13658f6b66a10e8a97370eb141be04039b4d.tar.zst
nixlib-fada13658f6b66a10e8a97370eb141be04039b4d.zip
Fix xf86inputsynaptics
svn path=/nixpkgs/trunk/; revision=24274
-rw-r--r--pkgs/servers/x11/xorg/default.nix5
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 5829a55f239f..14be8c440a11 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1364,7 +1364,10 @@ let
       url = mirror://xorg/individual/driver/xf86-input-synaptics-1.3.0.tar.bz2;
       sha256 = "1mwgb85qjyzx2yfi7jhgvd435zdyqxyq9aqwlsldmlpkqi8358rh";
     };
-    preConfigure = ''export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${xorgserver}/include/xorg"'';
+    preConfigure = ''
+      export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${xorgserver}/include/xorg"
+    '';
+    configureFlags = [ "--with-xorg-conf-dir=$out/share/X11/xorg.conf.d" ];
     buildInputs = [pkgconfig inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ];
   })) // {inherit inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ;};