diff options
| author | Alexander V. Nikolaev <avn@avnik.info> | 2018-02-24 15:12:44 +0200 |
|---|---|---|
| committer | Alexander V. Nikolaev <avn@avnik.info> | 2018-02-24 17:06:49 +0200 |
| commit | 0acec7e984ff38b7a296a459ba4b539a3b719c1b (patch) | |
| tree | 1d60ce67493ab87f80acb127f4e26a11a0324c28 /pkgs/development/python-modules | |
| parent | 1bc1909e5b89ec8d0e4ecadcbb5c66de0cb4fb5a (diff) | |
treewide: transition mesa to libGLU_combined
Diffstat (limited to 'pkgs/development/python-modules')
| -rw-r--r-- | pkgs/development/python-modules/pyftgl/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/python-modules/pyglet/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/python-modules/pyftgl/default.nix b/pkgs/development/python-modules/pyftgl/default.nix index 117169a26121b..a858374722551 100644 --- a/pkgs/development/python-modules/pyftgl/default.nix +++ b/pkgs/development/python-modules/pyftgl/default.nix @@ -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)"; diff --git a/pkgs/development/python-modules/pyglet/default.nix b/pkgs/development/python-modules/pyglet/default.nix index 8ac066500a4c1..3fc7f8ddb6835 100644 --- a/pkgs/development/python-modules/pyglet/default.nix +++ b/pkgs/development/python-modules/pyglet/default.nix @@ -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"; |