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

Merge pull request #46943 from lheckemann/glxinfo-bump

Browse Source 
glxinfo: 8.3.0 -> 8.4.0
This commit is contained in:
Jörg Thalheim 2018-09-20 11:43:35 +01:00 committed by GitHub
commit 22f97f4dcf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/tools/graphics/glxinfo/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "glxinfo-${version}"; name = "glxinfo-${version}";
version = "8.3.0"; version = "8.4.0";
src = fetchurl { src = fetchurl {
url = "ftp://ftp.freedesktop.org/pub/mesa/demos/${version}/mesa-demos-${version}.tar.bz2"; url = "ftp://ftp.freedesktop.org/pub/mesa/demos/mesa-demos-${version}.tar.bz2";
sha256 = "1vqb7s5m3fcg2csbiz45mha1pys2xx6rhw94fcyvapqdpm5iawy1"; sha256 = "0zgzbz55a14hz83gbmm0n9gpjnf5zadzi2kjjvkn6khql2a9rs81";
}; };
buildInputs = [ libX11 libGL ]; buildInputs = [ libX11 libGL ];
@ -14,14 +14,14 @@ stdenv.mkDerivation rec {
configurePhase = "true"; configurePhase = "true";
buildPhase = " buildPhase = "
cd src/xdemos $CC src/xdemos/{glxinfo.c,glinfo_common.c} -o glxinfo -lGL -lX11
$CC glxinfo.c glinfo_common.c -o glxinfo -lGL -lX11 $CC src/xdemos/glxgears.c -o glxgears -lGL -lX11 -lm
$CC glxgears.c -o glxgears -lGL -lX11 -lm $CC src/egl/opengles2/es2_info.c -o es2_info -lEGL -lGLESv2 -lX11
$CC src/egl/opengles2/es2gears.c src/egl/eglut/{eglut.c,eglut_x11.c} -o es2gears -Isrc/egl/eglut -lEGL -lGLESv2 -lX11 -lm
"; ";
installPhase = " installPhase = "
mkdir -p $out/bin install -Dm 555 -t $out/bin glx{info,gears} es2{_info,gears}
cp glxinfo glxgears $out/bin/
"; ";
meta = with stdenv.lib; { meta = with stdenv.lib; {