diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-09-20 11:43:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-20 11:43:35 +0100 |
| commit | 22f97f4dcf9152fc1d600fd94abdd6d39d6eff49 (patch) | |
| tree | 21c3203df063eac25a59c08eff93c2a275589171 /pkgs/tools | |
| parent | 280ebc2e40fabc3cf697c812fb0ecfd594446efc (diff) | |
| parent | e03b99c309565afe2fb090a1f5986e2c5fc95a5e (diff) | |
| download | nixlib-22f97f4dcf9152fc1d600fd94abdd6d39d6eff49.tar nixlib-22f97f4dcf9152fc1d600fd94abdd6d39d6eff49.tar.gz nixlib-22f97f4dcf9152fc1d600fd94abdd6d39d6eff49.tar.bz2 nixlib-22f97f4dcf9152fc1d600fd94abdd6d39d6eff49.tar.lz nixlib-22f97f4dcf9152fc1d600fd94abdd6d39d6eff49.tar.xz nixlib-22f97f4dcf9152fc1d600fd94abdd6d39d6eff49.tar.zst nixlib-22f97f4dcf9152fc1d600fd94abdd6d39d6eff49.zip | |
Merge pull request #46943 from lheckemann/glxinfo-bump
glxinfo: 8.3.0 -> 8.4.0
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/graphics/glxinfo/default.nix | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/tools/graphics/glxinfo/default.nix b/pkgs/tools/graphics/glxinfo/default.nix index a3a9a4d8eda4..6a2a3a5a46e8 100644 --- a/pkgs/tools/graphics/glxinfo/default.nix +++ b/pkgs/tools/graphics/glxinfo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "glxinfo-${version}"; - version = "8.3.0"; + version = "8.4.0"; src = fetchurl { - url = "ftp://ftp.freedesktop.org/pub/mesa/demos/${version}/mesa-demos-${version}.tar.bz2"; - sha256 = "1vqb7s5m3fcg2csbiz45mha1pys2xx6rhw94fcyvapqdpm5iawy1"; + url = "ftp://ftp.freedesktop.org/pub/mesa/demos/mesa-demos-${version}.tar.bz2"; + sha256 = "0zgzbz55a14hz83gbmm0n9gpjnf5zadzi2kjjvkn6khql2a9rs81"; }; buildInputs = [ libX11 libGL ]; @@ -14,14 +14,14 @@ stdenv.mkDerivation rec { configurePhase = "true"; buildPhase = " - cd src/xdemos - $CC glxinfo.c glinfo_common.c -o glxinfo -lGL -lX11 - $CC glxgears.c -o glxgears -lGL -lX11 -lm + $CC src/xdemos/{glxinfo.c,glinfo_common.c} -o glxinfo -lGL -lX11 + $CC src/xdemos/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 = " - mkdir -p $out/bin - cp glxinfo glxgears $out/bin/ + install -Dm 555 -t $out/bin glx{info,gears} es2{_info,gears} "; meta = with stdenv.lib; { |