diff options
| author | adisbladis <adisbladis@gmail.com> | 2019-11-10 16:44:34 +0000 |
|---|---|---|
| committer | adisbladis <adisbladis@gmail.com> | 2019-11-18 20:10:43 +0000 |
| commit | c9d8624ccddf17aee28745446b6763aabb26b4c7 (patch) | |
| tree | e7caf27ce92b6bc9b94eb65246cb6c2913adca44 /pkgs/development/tools/simavr | |
| parent | e6963bc983048c6f2b2d29efc5921a2d8f0c6e9c (diff) | |
| download | nixlib-c9d8624ccddf17aee28745446b6763aabb26b4c7.tar nixlib-c9d8624ccddf17aee28745446b6763aabb26b4c7.tar.gz nixlib-c9d8624ccddf17aee28745446b6763aabb26b4c7.tar.bz2 nixlib-c9d8624ccddf17aee28745446b6763aabb26b4c7.tar.lz nixlib-c9d8624ccddf17aee28745446b6763aabb26b4c7.tar.xz nixlib-c9d8624ccddf17aee28745446b6763aabb26b4c7.tar.zst nixlib-c9d8624ccddf17aee28745446b6763aabb26b4c7.zip | |
treewide: Get rid of libGLU_combined
Diffstat (limited to 'pkgs/development/tools/simavr')
| -rw-r--r-- | pkgs/development/tools/simavr/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/tools/simavr/default.nix b/pkgs/development/tools/simavr/default.nix index 71f488c760a4..c7bc96871f8d 100644 --- a/pkgs/development/tools/simavr/default.nix +++ b/pkgs/development/tools/simavr/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, libelf, which, pkgconfig, freeglut , avrgcc, avrlibc -, libGLU_combined +, libGLU, libGL , GLUT }: stdenv.mkDerivation rec { @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ which pkgconfig avrgcc ]; - buildInputs = [ libelf freeglut libGLU_combined ] + buildInputs = [ libelf freeglut libGLU libGL ] ++ stdenv.lib.optional stdenv.isDarwin GLUT; # Hack to avoid TMPDIR in RPATHs. |