diff options
author | Robin Gloster <mail@glob.in> | 2016-07-31 20:51:34 +0000 |
---|---|---|
committer | Robin Gloster <mail@glob.in> | 2016-07-31 20:51:34 +0000 |
commit | 63c7b4f9a7844f0bc84d008b810375eb0fba6b2f (patch) | |
tree | e351ecd702d87ab1c4fd03246383162ec19d6de2 /pkgs/servers/x11 | |
parent | 43ba8d295f414ab985bd3fc5d5125421bd8bd0ad (diff) | |
parent | a629cd3f02c2ad071e58d5898c5f48fb0336a705 (diff) | |
download | nixlib-63c7b4f9a7844f0bc84d008b810375eb0fba6b2f.tar nixlib-63c7b4f9a7844f0bc84d008b810375eb0fba6b2f.tar.gz nixlib-63c7b4f9a7844f0bc84d008b810375eb0fba6b2f.tar.bz2 nixlib-63c7b4f9a7844f0bc84d008b810375eb0fba6b2f.tar.lz nixlib-63c7b4f9a7844f0bc84d008b810375eb0fba6b2f.tar.xz nixlib-63c7b4f9a7844f0bc84d008b810375eb0fba6b2f.tar.zst nixlib-63c7b4f9a7844f0bc84d008b810375eb0fba6b2f.zip |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/servers/x11')
-rw-r--r-- | pkgs/servers/x11/xorg/default.nix | 15 | ||||
-rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 9 | ||||
-rw-r--r-- | pkgs/servers/x11/xorg/tarballs-7.7.list | 1 |
3 files changed, 5 insertions, 20 deletions
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 63e628bf29e1..4a2ac2469d82 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -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"; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index fdf2a44210b8..e16e53fe8818 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -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 diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 06a1699017ff..3dae9846335d 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -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 |