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

treewide: transition mesa to libGLU_combined

Browse Source
This commit is contained in:
Alexander V. Nikolaev
2018-02-24 15:12:44 +02:00
parent 1bc1909e5b
commit 0acec7e984
273 changed files with 572 additions and 572 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
{ stdenv, buildPythonPackage, fetchFromGitHub, isPy3k
, boost, freetype, ftgl, mesa }:
, boost, freetype, ftgl, libGLU_combined }:
buildPythonPackage rec {
pname = "pyftgl";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
sed -i "s,'boost_python','boost_python3',g" setup.py
'';
buildInputs = [ boost freetype ftgl mesa ];
buildInputs = [ boost freetype ftgl libGLU_combined ];
meta = with stdenv.lib; {
description = "Python bindings for FTGL (FreeType for OpenGL)";

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

@@ -1,5 +1,5 @@
{ stdenv, buildPythonPackage, fetchPypi
, mesa, xorg, freetype, fontconfig, future}:
, libGLU_combined, xorg, freetype, fontconfig, future}:
buildPythonPackage rec {
version = "1.3.1";
@@ -11,7 +11,7 @@ buildPythonPackage rec {
};
postPatch = let
libs = [ mesa xorg.libX11 freetype fontconfig ];
libs = [ libGLU_combined xorg.libX11 freetype fontconfig ];
paths = builtins.concatStringsSep "," (map (l: "\"${l}/lib\"") libs);
in "sed -i -e 's|directories\.extend.*lib[^]]*|&,${paths}|' pyglet/lib.py";