public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xorg: add fglrxCompat parameter

Browse Source
This commit is contained in:
Vladimír Čunát 2016-05-22 22:16:12 +02:00
parent 381f72b37f
commit ff2d137410
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/servers/x11/xorg/overrides.nix
View File

@ -363,7 +363,22 @@ in
''; '';
}; };
xorgserver = with xorg; attrs: attrs // xorgserver = with xorg; attrs_passed:
# exchange attrs if fglrxCompat is set
let
attrs = if !args.fglrxCompat then attrs_passed else
with args; {
name = "xorg-server-1.17.4";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/xserver/xorg-server-1.17.4.tar.bz2;
sha256 = "0mv4ilpqi5hpg182mzqn766frhi6rw48aba3xfbaj4m82v0lajqc";
};
buildInputs = [pkgconfig dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ];
meta.platforms = stdenv.lib.platforms.unix;
};
in attrs //
(let (let
version = (builtins.parseDrvName attrs.name).version; version = (builtins.parseDrvName attrs.name).version;
commonBuildInputs = attrs.buildInputs ++ [ xtrans ]; commonBuildInputs = attrs.buildInputs ++ [ xtrans ];

1
pkgs/top-level/all-packages.nix
View File

@ -10268,6 +10268,7 @@ in
mesa = mesa_noglu; mesa = mesa_noglu;
udev = if stdenv.isLinux then udev else null; udev = if stdenv.isLinux then udev else null;
libdrm = if stdenv.isLinux then libdrm else null; libdrm = if stdenv.isLinux then libdrm else null;
fglrxCompat = false;
} // { inherit xlibsWrapper; } ); } // { inherit xlibsWrapper; } );
xwayland = callPackage ../servers/x11/xorg/xwayland.nix { }; xwayland = callPackage ../servers/x11/xorg/xwayland.nix { };