diff options
| author | Robin Gloster <mail@glob.in> | 2016-07-21 00:56:43 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-07-21 00:56:43 +0000 |
| commit | 1f04b4a566d3c8f8de5354ed09dee46557c4abe3 (patch) | |
| tree | b8239cfc8cced160642aa698e18048844164ccc6 /pkgs/servers/x11 | |
| parent | cc540843fe88a5e490e07e861f8dbb8f4714ece7 (diff) | |
| parent | db7b4fb073d25832ecc4e216d410ad2dde153c43 (diff) | |
| download | nixlib-1f04b4a566d3c8f8de5354ed09dee46557c4abe3.tar nixlib-1f04b4a566d3c8f8de5354ed09dee46557c4abe3.tar.gz nixlib-1f04b4a566d3c8f8de5354ed09dee46557c4abe3.tar.bz2 nixlib-1f04b4a566d3c8f8de5354ed09dee46557c4abe3.tar.lz nixlib-1f04b4a566d3c8f8de5354ed09dee46557c4abe3.tar.xz nixlib-1f04b4a566d3c8f8de5354ed09dee46557c4abe3.tar.zst nixlib-1f04b4a566d3c8f8de5354ed09dee46557c4abe3.zip | |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
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 4ca76748ffa2..fdf2a44210b8 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"; }; |