diff options
| author | Lluís Batlle i Rossell <viric@viric.name> | 2016-07-20 12:33:06 +0200 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@viric.name> | 2016-07-20 12:33:24 +0200 |
| commit | 13fc6e56fe8012936710a0475e2fd833acc3d3fc (patch) | |
| tree | 1a523f2fdeeb9615a3cf1335886e0c2c6742ac32 /pkgs/servers/x11 | |
| parent | 024cb9eecd1f25dad64622ce1e59299059d5019c (diff) | |
| download | nixlib-13fc6e56fe8012936710a0475e2fd833acc3d3fc.tar nixlib-13fc6e56fe8012936710a0475e2fd833acc3d3fc.tar.gz nixlib-13fc6e56fe8012936710a0475e2fd833acc3d3fc.tar.bz2 nixlib-13fc6e56fe8012936710a0475e2fd833acc3d3fc.tar.lz nixlib-13fc6e56fe8012936710a0475e2fd833acc3d3fc.tar.xz nixlib-13fc6e56fe8012936710a0475e2fd833acc3d3fc.tar.zst nixlib-13fc6e56fe8012936710a0475e2fd833acc3d3fc.zip | |
Adding intel-gpu-tools to xorg.
Diffstat (limited to 'pkgs/servers/x11')
| -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, 16 insertions, 0 deletions
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 32303dac3863..63e628bf29e1 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -611,6 +611,17 @@ 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 56a7b1f76a98..3129e090e6b6 100644 --- a/pkgs/servers/x11/xorg/extra.list +++ b/pkgs/servers/x11/xorg/extra.list @@ -9,3 +9,4 @@ 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 99964bd77c30..bc00df85bdae 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -57,6 +57,10 @@ 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"; }; |