diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2014-03-14 12:32:38 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2014-03-21 10:34:19 +0100 |
commit | eac9324034f2e86962cb8832d0944863b148b805 (patch) | |
tree | 1ec92c21f312918d1c4a94e8e2bb14805caa1f35 /pkgs/servers | |
parent | 23682d02d0031a9636f320d16659712d2ad8121b (diff) | |
download | nixlib-eac9324034f2e86962cb8832d0944863b148b805.tar nixlib-eac9324034f2e86962cb8832d0944863b148b805.tar.gz nixlib-eac9324034f2e86962cb8832d0944863b148b805.tar.bz2 nixlib-eac9324034f2e86962cb8832d0944863b148b805.tar.lz nixlib-eac9324034f2e86962cb8832d0944863b148b805.tar.xz nixlib-eac9324034f2e86962cb8832d0944863b148b805.tar.zst nixlib-eac9324034f2e86962cb8832d0944863b148b805.zip |
xorg: fixup after the update
All that built before update builds now again (and glamor-egl is new).
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 8b2617f06216..ead54a58a6bf 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -37,6 +37,10 @@ in ''; }; + glamoregl = attrs: attrs // { + installFlags = "sdkdir=\${out}/include/xorg configdir=\${out}/share/X11/xorg.conf.d"; + }; + imake = attrs: attrs // { inherit (xorg) xorgcffiles; x11BuildHook = ./imake.sh; @@ -158,7 +162,7 @@ in xf86inputsynaptics = attrs: attrs // { buildInputs = attrs.buildInputs ++ [args.mtdev]; - installFlags = "sdkdir=\${out}/include/xorg configdir=\${out}/include/xorg"; + installFlags = "sdkdir=\${out}/include/xorg configdir=\${out}/share/X11/xorg.conf.d"; }; xf86inputvmmouse = attrs: attrs // { @@ -169,6 +173,10 @@ in ]; }; + xf86videoati = attrs: attrs // { + NIX_CFLAGS_COMPILE = "-I${xorg.glamoregl}/include/xorg"; + }; + xf86videonv = attrs: attrs // { patches = [( args.fetchurl { url = http://cgit.freedesktop.org/xorg/driver/xf86-video-nv/patch/?id=fc78fe98222b0204b8a2872a529763d6fe5048da; @@ -209,13 +217,6 @@ in ''; }; - xmodmap = attrs: attrs // { - patches = [(args.fetchurl { - url = http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/x11-apps/xmodmap/files/xmodmap-1.0.7-_GNU_SOURCE.patch; - sha256 = "0q3zhy0wy1kkbpagzav8869fais4lw5q5vybgjj7wkmak06c5648"; - name = "new-gcc.patch"; - })]; - }; xorgserver = with xorg; attrs: attrs // { configureFlags = [ "--enable-xcsecurity" # enable SECURITY extension @@ -277,6 +278,6 @@ in }; xwd = attrs: attrs // { - buildInputs = attrs.buildInputs ++ [xorg.libXt]; + buildInputs = with xorg; attrs.buildInputs ++ [libXt libxkbfile]; }; } |