From 08e99191f66c4a6cfe045601411bf6db08a78cac Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Wed, 18 Jan 2017 21:29:31 +0100 Subject: [PATCH 1/2] remove xorg.intelgputools in favor of intel-gpu-tools There is no reason in having both and the latter is a separate derivation and thus easier to maintain. Closes #21976 --- pkgs/servers/x11/xorg/default.nix | 11 ----------- pkgs/servers/x11/xorg/overrides.nix | 4 ---- 2 files changed, 15 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 07243682283f..d5a3bea67a61 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -602,17 +602,6 @@ let meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; - intelgputools = (mkDerivation "intelgputools" { - name = "intel-gpu-tools-1.15"; - builder = ./builder.sh; - src = fetchurl { - url = mirror://xorg/individual/app/intel-gpu-tools-1.15.tar.bz2; - sha256 = "1gb22hvj4gdjj92iqbwcp44kf2znk2l1fvbcrr4sm4i65l8mdwnw"; - }; - buildInputs = [pkgconfig dri2proto libdrm udev libpciaccess python libX11 libXext libXrandr libXv ]; - meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit dri2proto libdrm udev libpciaccess python libX11 libXext libXrandr libXv ;}; - kbproto = (mkDerivation "kbproto" { name = "kbproto-1.0.7"; builder = ./builder.sh; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 5a57609146a5..889dd58c01bc 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -57,10 +57,6 @@ in tradcpp = if stdenv.isDarwin then args.tradcpp else null; }; - intelgputools = attrs: attrs // { - buildInputs = attrs.buildInputs ++ [ args.cairo args.libunwind ]; - }; - mkfontdir = attrs: attrs // { preBuild = "substituteInPlace mkfontdir.in --replace @bindir@ ${xorg.mkfontscale}/bin"; }; From 42c1f449bd6fa205baef8ba267acb339791fa514 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 19 Jan 2017 09:41:38 +0100 Subject: [PATCH 2/2] intel-gpu-tools: finish removing the duplicate --- pkgs/servers/x11/xorg/extra.list | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/servers/x11/xorg/extra.list b/pkgs/servers/x11/xorg/extra.list index 3129e090e6b6..56a7b1f76a98 100644 --- a/pkgs/servers/x11/xorg/extra.list +++ b/pkgs/servers/x11/xorg/extra.list @@ -9,4 +9,3 @@ http://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.9.tar.bz2 http://xcb.freedesktop.org/dist/xcb-util-wm-0.4.1.tar.bz2 http://xcb.freedesktop.org/dist/xcb-util-errors-1.0.tar.bz2 mirror://xorg/individual/app/appres-1.0.4.tar.bz2 -mirror://xorg/individual/app/intel-gpu-tools-1.15.tar.bz2