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/tools | |
parent | 1bc1909e5b89ec8d0e4ecadcbb5c66de0cb4fb5a (diff) | |
download | nixlib-0acec7e984ff38b7a296a459ba4b539a3b719c1b.tar nixlib-0acec7e984ff38b7a296a459ba4b539a3b719c1b.tar.gz nixlib-0acec7e984ff38b7a296a459ba4b539a3b719c1b.tar.bz2 nixlib-0acec7e984ff38b7a296a459ba4b539a3b719c1b.tar.lz nixlib-0acec7e984ff38b7a296a459ba4b539a3b719c1b.tar.xz nixlib-0acec7e984ff38b7a296a459ba4b539a3b719c1b.tar.zst nixlib-0acec7e984ff38b7a296a459ba4b539a3b719c1b.zip |
treewide: transition mesa to libGLU_combined
Diffstat (limited to 'pkgs/development/tools')
-rw-r--r-- | pkgs/development/tools/godot/pkg_config_additions.patch | 2 | ||||
-rw-r--r-- | pkgs/development/tools/simavr/default.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/tools/godot/pkg_config_additions.patch b/pkgs/development/tools/godot/pkg_config_additions.patch index c4675322e2b3..2302710ac7e4 100644 --- a/pkgs/development/tools/godot/pkg_config_additions.patch +++ b/pkgs/development/tools/godot/pkg_config_additions.patch @@ -4,7 +4,7 @@ env.ParseConfig('pkg-config xcursor --cflags --libs') env.ParseConfig('pkg-config xrandr --cflags --libs') + env.ParseConfig('pkg-config xrender --cflags --libs') -+ env.ParseConfig('pkg-config osmesa --cflags') ++ env.ParseConfig('pkg-config oslibGLU_combined --cflags') + env.ParseConfig('pkg-config glu --cflags --libs') + env.ParseConfig('pkg-config zlib --cflags --libs') diff --git a/pkgs/development/tools/simavr/default.nix b/pkgs/development/tools/simavr/default.nix index e3dda5094275..b009d5ed601b 100644 --- a/pkgs/development/tools/simavr/default.nix +++ b/pkgs/development/tools/simavr/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, avrbinutils, avrgcc, avrlibc, libelf, which, git, pkgconfig, freeglut -, mesa }: +, libGLU_combined }: stdenv.mkDerivation rec { name = "simavr-${version}"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ which git avrbinutils avrgcc avrlibc libelf freeglut mesa ]; + buildInputs = [ which git avrbinutils avrgcc avrlibc libelf freeglut libGLU_combined ]; meta = with stdenv.lib; { description = "A lean and mean Atmel AVR simulator"; |