BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge #21979: remove duplicate xorg.intelgputools

Browse source 
... in favor of intel-gpu-tools.
This commit is contained in:
Vladimír Čunát 2017-01-19 09:42:14 +01:00
commit 29380256a6
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
3 changed files with 0 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/servers/x11/xorg/default.nix
View file

@ -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;

1
pkgs/servers/x11/xorg/extra.list
View file

@ -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

4
pkgs/servers/x11/xorg/overrides.nix
View file

@ -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";
};