mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 21:50:55 +00:00
Code Issues Wiki Activity

Merge pull request #17378 from gebner/xorg-glamor

Browse source 
xorg: switch to current glamor driver
This commit is contained in:
Gabriel Ebner 2016-07-30 17:10:51 +02:00 committed by GitHub
parent 6ff942aea4 07fc65289a
commit 1e43d54695
5 changed files with 7 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
nixos/modules/services/x11/xserver.nix
View file

@ -14,9 +14,6 @@ let
# Map video driver names to driver packages. FIXME: move into card-specific modules.
knownVideoDrivers = {
virtualbox = { modules = [ kernelPackages.virtualboxGuestAdditions ]; driverName = "vboxvideo"; };
ati = { modules = with pkgs.xorg; [ xf86videoati glamoregl ]; };
intel = { modules = with pkgs.xorg; [ xf86videointel glamoregl ]; };
modesetting = { modules = []; };
};
fontsForXServer =
@ -512,7 +509,7 @@ in
XKB_BINDIR = "${xorg.xkbcomp}/bin"; # Needed for the Xkb extension.
XORG_DRI_DRIVER_PATH = "/run/opengl-driver/lib/dri"; # !!! Depends on the driver selected at runtime.
LD_LIBRARY_PATH = concatStringsSep ":" (
[ "${xorg.libX11.out}/lib" "${xorg.libXext.out}/lib" ]
[ "${xorg.libX11.out}/lib" "${xorg.libXext.out}/lib" "/run/opengl-driver/lib" ]
++ concatLists (catAttrs "libPath" cfg.drivers));
} // cfg.displayManager.job.environment;

15
pkgs/servers/x11/xorg/default.nix
View file

@ -556,17 +556,6 @@ let
meta.platforms = stdenv.lib.platforms.unix;
}) // {inherit ;};
glamoregl = (mkDerivation "glamoregl" {
name = "glamor-egl-0.6.0";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/driver/glamor-egl-0.6.0.tar.bz2;
sha256 = "1jg5clihklb9drh1jd7nhhdsszla6nv7xmbvm8yvakh5wrb1nlv6";
};
buildInputs = [pkgconfig dri2proto xorgserver ];
meta.platforms = stdenv.lib.platforms.unix;
}) // {inherit dri2proto xorgserver ;};
glproto = (mkDerivation "glproto" {
name = "glproto-1.4.17";
builder = ./builder.sh;
@ -1718,9 +1707,9 @@ let
url = mirror://xorg/individual/driver/xf86-video-ati-7.7.0.tar.bz2;
sha256 = "1hy1n8an98mflfbdcb3q7wv59x971j7nf9zhivf90p0lgdbiqkc4";
};
buildInputs = [pkgconfig fontsproto glamoregl libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
buildInputs = [pkgconfig fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
meta.platforms = stdenv.lib.platforms.unix;
}) // {inherit fontsproto glamoregl libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
}) // {inherit fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
xf86videochips = (mkDerivation "xf86videochips" {
name = "xf86-video-chips-1.2.6";

9
pkgs/servers/x11/xorg/overrides.nix
View file

@ -41,10 +41,6 @@ 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;
@ -324,7 +320,7 @@ in
};
xf86videoati = attrs: attrs // {
NIX_CFLAGS_COMPILE = "-I${xorg.glamoregl}/include/xorg";
NIX_CFLAGS_COMPILE = "-I${xorg.xorgserver}/include/xorg";
};
xf86videonv = attrs: attrs // {
@ -418,7 +414,7 @@ in
then {
outputs = [ "dev" "out" ];
buildInputs = [ makeWrapper ] ++ commonBuildInputs;
propagatedBuildInputs = [ libpciaccess ] ++ commonPropagatedBuildInputs ++ lib.optionals stdenv.isLinux [
propagatedBuildInputs = [ libpciaccess args.epoxy ] ++ commonPropagatedBuildInputs ++ lib.optionals stdenv.isLinux [
args.udev
];
patches = commonPatches;
@ -428,6 +424,7 @@ in
"--enable-xcsecurity" # enable SECURITY extension
"--with-default-font-path=" # there were only paths containing "${prefix}",
# and there are no fonts in this package anyway
"--enable-glamor"
];
postInstall = ''
rm -fr $out/share/X11/xkb/compiled

1
pkgs/servers/x11/xorg/tarballs-7.7.list
View file

@ -130,7 +130,6 @@ mirror://xorg/individual/driver/xf86-input-void-1.4.1.tar.bz2
mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2
mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2
mirror://xorg/individual/driver/xf86-video-ati-7.7.0.tar.bz2
mirror://xorg/individual/driver/glamor-egl-0.6.0.tar.bz2
mirror://xorg/individual/driver/xf86-video-nouveau-1.0.12.tar.bz2
mirror://xorg/individual/driver/xf86-video-chips-1.2.6.tar.bz2
mirror://xorg/individual/driver/xf86-video-cirrus-1.5.3.tar.bz2

2
pkgs/top-level/all-packages.nix
View file

@ -10667,7 +10667,7 @@ in
libxslt expat libpng zlib perl mesa_drivers spice_protocol libunwind
dbus libuuid openssl gperf m4 libevdev tradcpp libinput mcpp makeWrapper autoreconfHook
autoconf automake libtool xmlto asciidoc flex bison python mtdev pixman
cairo;
cairo epoxy;
inherit (darwin) apple_sdk cf-private libobjc;
bootstrap_cmds = if stdenv.isDarwin then darwin.bootstrap_cmds else null;
mesa = mesa_noglu;