diff options
author | Alyssa Ross <hi@alyssa.is> | 2020-04-01 15:50:50 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2020-04-01 15:50:50 +0000 |
commit | 75eafe97f7df0d653bec67f3962214d7c357831f (patch) | |
tree | 09f2cc901e0e637876cbb78d192dfe2fcfef8156 /nixpkgs/pkgs/development/libraries/virglrenderer | |
parent | a53b121bf4331497da63df3b1b7f1a7897dad146 (diff) | |
parent | a2e06fc3423c4be53181b15c28dfbe0bcf67dd73 (diff) | |
download | nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar.gz nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar.bz2 nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar.lz nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar.xz nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar.zst nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.zip |
Merge commit 'a2e06fc3423c4be53181b15c28dfbe0bcf67dd73'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/virglrenderer')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/virglrenderer/default.nix | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/nixpkgs/pkgs/development/libraries/virglrenderer/default.nix b/nixpkgs/pkgs/development/libraries/virglrenderer/default.nix index 71bd608e93a1..5c508f133e14 100644 --- a/nixpkgs/pkgs/development/libraries/virglrenderer/default.nix +++ b/nixpkgs/pkgs/development/libraries/virglrenderer/default.nix @@ -1,24 +1,21 @@ -{ stdenv, fetchurl, pkgconfig, libGLU, epoxy, libX11, libdrm, mesa }: - +{ stdenv, fetchurl, cmake, meson, ninja, pkgconfig, python3 +, libGLU, epoxy, libX11, libdrm, mesa +}: stdenv.mkDerivation rec { - pname = "virglrenderer"; - version = "0.7.0"; + version = "0.8.1"; src = fetchurl { - url = "https://www.freedesktop.org/software/virgl/${pname}-${version}.tar.bz2"; - sha256 = "041agg1d6i8hg250y30f08n3via0hs9rbijxdrfifb8ara805v0m"; + url = "https://gitlab.freedesktop.org/virgl/virglrenderer/-/archive/virglrenderer-${version}/virglrenderer-virglrenderer-${version}.tar.bz2"; + sha256 = "0ac39mplmy6lmcd6cljmfsrfby7m6ac3dzvmnn5pv200drl415l4"; }; buildInputs = [ libGLU epoxy libX11 libdrm mesa ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ cmake meson ninja pkgconfig python3 ]; - # Fix use of fd_set without proper include - prePatch = '' - sed -e '1i#include <sys/select.h>' -i vtest/util.c - ''; + dontUseCmakeConfigure = true; meta = with stdenv.lib; { description = "A virtual 3D GPU library that allows a qemu guest to use the host GPU for accelerated 3D rendering"; @@ -27,5 +24,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = [ maintainers.xeji ]; }; - } |