tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
xorg: add fglrxCompat parameter
Vladimír Čunát
9 years ago
ff2d1374
381f72b3
+17
-1
2 changed files
expand all
collapse all
unified
split
pkgs
servers
x11
xorg
overrides.nix
top-level
all-packages.nix
+16
-1
pkgs/servers/x11/xorg/overrides.nix
···
363
363
'';
364
364
};
365
365
366
366
-
xorgserver = with xorg; attrs: attrs //
366
366
+
xorgserver = with xorg; attrs_passed:
367
367
+
# exchange attrs if fglrxCompat is set
368
368
+
let
369
369
+
attrs = if !args.fglrxCompat then attrs_passed else
370
370
+
with args; {
371
371
+
name = "xorg-server-1.17.4";
372
372
+
builder = ./builder.sh;
373
373
+
src = fetchurl {
374
374
+
url = mirror://xorg/individual/xserver/xorg-server-1.17.4.tar.bz2;
375
375
+
sha256 = "0mv4ilpqi5hpg182mzqn766frhi6rw48aba3xfbaj4m82v0lajqc";
376
376
+
};
377
377
+
buildInputs = [pkgconfig dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ];
378
378
+
meta.platforms = stdenv.lib.platforms.unix;
379
379
+
};
380
380
+
381
381
+
in attrs //
367
382
(let
368
383
version = (builtins.parseDrvName attrs.name).version;
369
384
commonBuildInputs = attrs.buildInputs ++ [ xtrans ];
+1
pkgs/top-level/all-packages.nix
···
10268
10268
mesa = mesa_noglu;
10269
10269
udev = if stdenv.isLinux then udev else null;
10270
10270
libdrm = if stdenv.isLinux then libdrm else null;
10271
10271
+
fglrxCompat = false;
10271
10272
} // { inherit xlibsWrapper; } );
10272
10273
10273
10274
xwayland = callPackage ../servers/x11/xorg/xwayland.nix { };