diff options
author | Pascal Wittmann <mail@pascal-wittmann.de> | 2017-01-18 21:29:31 +0100 |
---|---|---|
committer | Pascal Wittmann <mail@pascal-wittmann.de> | 2017-01-18 21:47:22 +0100 |
commit | 08e99191f66c4a6cfe045601411bf6db08a78cac (patch) | |
tree | 8ee22937dde157b4a9f2a4ab2e693bfb4a00ccf5 /pkgs/servers | |
parent | f4f4200d9ad497efaf4366cfb95112aee20cc32e (diff) | |
download | nixlib-08e99191f66c4a6cfe045601411bf6db08a78cac.tar nixlib-08e99191f66c4a6cfe045601411bf6db08a78cac.tar.gz nixlib-08e99191f66c4a6cfe045601411bf6db08a78cac.tar.bz2 nixlib-08e99191f66c4a6cfe045601411bf6db08a78cac.tar.lz nixlib-08e99191f66c4a6cfe045601411bf6db08a78cac.tar.xz nixlib-08e99191f66c4a6cfe045601411bf6db08a78cac.tar.zst nixlib-08e99191f66c4a6cfe045601411bf6db08a78cac.zip |
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
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/x11/xorg/default.nix | 11 | ||||
-rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 4 |
2 files changed, 0 insertions, 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"; }; |