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

Merge pull request #72999 from adisbladis/mesa-19_2_3

Browse Source 
mesa: 19.2.1 -> 19.2.3 (and associated fixes)
This commit is contained in:
adisbladis
2019-11-10 13:08:37 +00:00
committed by GitHub
parent 802c81efa4 d5937a8096
commit 119b1b630d
30 changed files with 767 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/python-modules/pyside/default.nix
View File

@@ -1,4 +1,4 @@
{ lib, fetchurl, cmake, buildPythonPackage, pysideGeneratorrunner, pysideShiboken, qt4, mesa }:
{ lib, fetchurl, cmake, buildPythonPackage, pysideGeneratorrunner, pysideShiboken, qt4, mesa, libGL }:
# This derivation provides a Python module and should therefore be called via `python-packages.nix`.
buildPythonPackage rec {
@@ -15,7 +15,7 @@ buildPythonPackage rec {
nativeBuildInputs = [ cmake pysideGeneratorrunner pysideShiboken qt4 ];
buildInputs = [ mesa ];
buildInputs = [ mesa libGL ];
makeFlags = "QT_PLUGIN_PATH=" + pysideShiboken + "/lib/generatorrunner";