public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove xorg.intelgputools in favor of intel-gpu-tools

Browse Source 
There is no reason in having both and the latter is a
separate derivation and thus easier to maintain.

Closes #21976
This commit is contained in:
Pascal Wittmann 2017-01-18 21:29:31 +01:00
parent f4f4200d9a
commit 08e99191f6
No known key found for this signature in database
GPG Key ID: C899ACE7E2322852
2 changed files with 0 additions and 15 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; meta.platforms = stdenv.lib.platforms.unix;
}) // {inherit ;}; }) // {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" { kbproto = (mkDerivation "kbproto" {
name = "kbproto-1.0.7"; name = "kbproto-1.0.7";
builder = ./builder.sh; builder = ./builder.sh;

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

@ -57,10 +57,6 @@ in
tradcpp = if stdenv.isDarwin then args.tradcpp else null; tradcpp = if stdenv.isDarwin then args.tradcpp else null;
}; };
intelgputools = attrs: attrs // {
buildInputs = attrs.buildInputs ++ [ args.cairo args.libunwind ];
};
mkfontdir = attrs: attrs // { mkfontdir = attrs: attrs // {
preBuild = "substituteInPlace mkfontdir.in --replace @bindir@ ${xorg.mkfontscale}/bin"; preBuild = "substituteInPlace mkfontdir.in --replace @bindir@ ${xorg.mkfontscale}/bin";
}; };