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

Adding intel-gpu-tools to xorg.

Browse Source
This commit is contained in:
Lluís Batlle i Rossell 2016-07-20 12:33:06 +02:00
parent 024cb9eecd
commit 13fc6e56fe
4 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -611,6 +611,17 @@ 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;

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

@ -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-wm-0.4.1.tar.bz2
http://xcb.freedesktop.org/dist/xcb-util-errors-1.0.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/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,6 +57,10 @@ 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";
}; };

3
pkgs/top-level/all-packages.nix
View File

@ -10573,7 +10573,8 @@ in
inherit clangStdenv fetchurl fetchgit fetchpatch stdenv pkgconfig intltool freetype fontconfig inherit clangStdenv fetchurl fetchgit fetchpatch stdenv pkgconfig intltool freetype fontconfig
libxslt expat libpng zlib perl mesa_drivers spice_protocol libunwind libxslt expat libpng zlib perl mesa_drivers spice_protocol libunwind
dbus libuuid openssl gperf m4 libevdev tradcpp libinput mcpp makeWrapper autoreconfHook dbus libuuid openssl gperf m4 libevdev tradcpp libinput mcpp makeWrapper autoreconfHook
autoconf automake libtool xmlto asciidoc flex bison python mtdev pixman; autoconf automake libtool xmlto asciidoc flex bison python mtdev pixman
cairo;
inherit (darwin) apple_sdk cf-private libobjc; inherit (darwin) apple_sdk cf-private libobjc;
bootstrap_cmds = if stdenv.isDarwin then darwin.bootstrap_cmds else null; bootstrap_cmds = if stdenv.isDarwin then darwin.bootstrap_cmds else null;
mesa = mesa_noglu; mesa = mesa_noglu;