glmark2: 2014.03 -> 2015-06-11 (#16812)

This commit is contained in:
Ram Kromberg 2016-07-09 15:50:24 +03:00 committed by Franz Pletz
parent 57e1a6c48d
commit 781cd33f3b

View File

@ -1,19 +1,22 @@
{ stdenv, fetchurl, pkgconfig, libjpeg, libpng12, xorg, libX11, mesa, libdrm, python27 }: { stdenv, fetchFromGitHub, pkgconfig, libjpeg, libpng, xorg, libX11, mesa, libdrm, python27, wayland }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "glmark2-${version}"; name = "glmark2-${version}";
version = "2014.03"; version = "2015-06-11";
src = fetchurl { src = fetchFromGitHub {
url = "https://launchpad.net/glmark2/trunk/${version}/+download/${name}.tar.gz"; owner = "glmark2";
sha256 = "1dgn7ln115ivk13d1yagpj06lgllpv2jrr41kcnhdkhqz6m43vdx"; repo = "glmark2";
rev = "fa71af2dfab711fac87b9504b6fc9862f44bf72a";
sha256 = "1razwrmwk94wf8y7rnqpas9520gidixzcwa65pg946n823105znw";
}; };
buildInputs = [ buildInputs = [
pkgconfig libjpeg libpng12 xorg.libxcb libX11 mesa libdrm python27 pkgconfig libjpeg libpng xorg.libxcb libX11 mesa libdrm python27 wayland
]; ];
buildPhase = '' buildPhase = ''
python ./waf configure --prefix=$out --with-flavors x11-gl,x11-glesv2 python ./waf configure --prefix=$out --with-flavors x11-gl,x11-glesv2,drm-gl,drm-glesv2,wayland-gl,wayland-glesv2
python2 ./waf python2 ./waf
''; '';
@ -23,7 +26,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "OpenGL (ES) 2.0 benchmark"; description = "OpenGL (ES) 2.0 benchmark";
homepage = https://launchpad.net/glmark2; homepage = https://github.com/glmark2/glmark2;
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
longDescription = '' longDescription = ''
glmark2 is a benchmark for OpenGL (ES) 2.0. It uses only the subset of glmark2 is a benchmark for OpenGL (ES) 2.0. It uses only the subset of
@ -33,4 +36,3 @@ stdenv.mkDerivation rec {
maintainers = [ maintainers.wmertens ]; maintainers = [ maintainers.wmertens ];
}; };
} }