diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-01-19 09:42:14 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-01-19 09:44:22 +0100 |
| commit | 29380256a685dd790105ea0a5d5bd33ffa8c2999 (patch) | |
| tree | 1f3f26a54549c897e4a1a4e601bf1cf484537441 /pkgs/servers | |
| parent | f953ef875d67a6484110a2bf397956edc24601ec (diff) | |
| parent | 42c1f449bd6fa205baef8ba267acb339791fa514 (diff) | |
| download | nixlib-29380256a685dd790105ea0a5d5bd33ffa8c2999.tar nixlib-29380256a685dd790105ea0a5d5bd33ffa8c2999.tar.gz nixlib-29380256a685dd790105ea0a5d5bd33ffa8c2999.tar.bz2 nixlib-29380256a685dd790105ea0a5d5bd33ffa8c2999.tar.lz nixlib-29380256a685dd790105ea0a5d5bd33ffa8c2999.tar.xz nixlib-29380256a685dd790105ea0a5d5bd33ffa8c2999.tar.zst nixlib-29380256a685dd790105ea0a5d5bd33ffa8c2999.zip | |
Merge #21979: remove duplicate xorg.intelgputools
... in favor of intel-gpu-tools.
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/x11/xorg/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/servers/x11/xorg/extra.list | 1 | ||||
| -rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 4 |
3 files changed, 0 insertions, 16 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/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 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"; }; |