about summary refs log tree commit diff
path: root/pkgs/servers/x11
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2016-05-22 22:16:12 +0200
committerVladimír Čunát <vcunat@gmail.com>2016-05-22 22:16:12 +0200
commitff2d137410672d7ec50fa7666a39aab2dbd73e91 (patch)
tree5dac19d6553a4df5e0bf366b0b21425c7ea179ca /pkgs/servers/x11
parent381f72b37f93890c5c36c82d2b1f49a83b8dc33a (diff)
downloadnixlib-ff2d137410672d7ec50fa7666a39aab2dbd73e91.tar
nixlib-ff2d137410672d7ec50fa7666a39aab2dbd73e91.tar.gz
nixlib-ff2d137410672d7ec50fa7666a39aab2dbd73e91.tar.bz2
nixlib-ff2d137410672d7ec50fa7666a39aab2dbd73e91.tar.lz
nixlib-ff2d137410672d7ec50fa7666a39aab2dbd73e91.tar.xz
nixlib-ff2d137410672d7ec50fa7666a39aab2dbd73e91.tar.zst
nixlib-ff2d137410672d7ec50fa7666a39aab2dbd73e91.zip
xorg: add fglrxCompat parameter
Diffstat (limited to 'pkgs/servers/x11')
-rw-r--r--pkgs/servers/x11/xorg/overrides.nix17
1 files changed, 16 insertions, 1 deletions
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index a19f479bf2ea..923d3a00bd5b 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -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
       version = (builtins.parseDrvName attrs.name).version;
       commonBuildInputs = attrs.buildInputs ++ [ xtrans ];