|
|
|
@ -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]; |
|
|
|
|
}; |
|
|
|
|
} |
|
|
|
|