diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2018-03-17 19:57:15 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2018-03-26 14:01:49 +0300 |
| commit | 22671aa03177cc6659d001c73be7b79a18f5413d (patch) | |
| tree | c0d305a7aa9a3fff3364039e635932f77f0970c6 | |
| parent | e2d59e06bff83676a9b10d804a36d94f8245d42d (diff) | |
| download | nixlib-22671aa03177cc6659d001c73be7b79a18f5413d.tar nixlib-22671aa03177cc6659d001c73be7b79a18f5413d.tar.gz nixlib-22671aa03177cc6659d001c73be7b79a18f5413d.tar.bz2 nixlib-22671aa03177cc6659d001c73be7b79a18f5413d.tar.lz nixlib-22671aa03177cc6659d001c73be7b79a18f5413d.tar.xz nixlib-22671aa03177cc6659d001c73be7b79a18f5413d.tar.zst nixlib-22671aa03177cc6659d001c73be7b79a18f5413d.zip | |
glxinfo: fix build
| -rw-r--r-- | pkgs/tools/graphics/glxinfo/default.nix | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/pkgs/tools/graphics/glxinfo/default.nix b/pkgs/tools/graphics/glxinfo/default.nix index b4b881e6c500..a3a9a4d8eda4 100644 --- a/pkgs/tools/graphics/glxinfo/default.nix +++ b/pkgs/tools/graphics/glxinfo/default.nix @@ -1,23 +1,22 @@ -{ stdenv, fetchurl, xlibsWrapper, libGL }: +{ stdenv, fetchurl, libGL, libX11 }: -let version = "8.3.0"; in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "glxinfo-${version}"; + version = "8.3.0"; src = fetchurl { - url = "ftp://ftp.freedesktop.org/pub/libGLU_combined/demos/${version}/mesa-demos-${version}.tar.bz2"; + url = "ftp://ftp.freedesktop.org/pub/mesa/demos/${version}/mesa-demos-${version}.tar.bz2"; sha256 = "1vqb7s5m3fcg2csbiz45mha1pys2xx6rhw94fcyvapqdpm5iawy1"; }; - buildInputs = [ xlibsWrapper libGL ]; + buildInputs = [ libX11 libGL ]; configurePhase = "true"; buildPhase = " cd src/xdemos - gcc glxinfo.c glinfo_common.c -o glxinfo -lGL -lX11 - gcc glxgears.c -o glxgears -lGL -lX11 + $CC glxinfo.c glinfo_common.c -o glxinfo -lGL -lX11 + $CC glxgears.c -o glxgears -lGL -lX11 -lm "; installPhase = " @@ -25,7 +24,11 @@ stdenv.mkDerivation { cp glxinfo glxgears $out/bin/ "; - meta = { - platforms = stdenv.lib.platforms.linux; + meta = with stdenv.lib; { + description = "Test utilities for OpenGL"; + homepage = https://www.mesa3d.org/; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ abbradar ]; }; } |