diff options
| author | adisbladis <adisbladis@gmail.com> | 2019-11-07 16:39:41 +0000 |
|---|---|---|
| committer | adisbladis <adisbladis@gmail.com> | 2019-11-09 10:34:52 +0000 |
| commit | 803f9cce9d90d5e67b88d08409092472ad565c4b (patch) | |
| tree | 5c7c6ef6ceb7bb24b34516084113bca7ae414a36 | |
| parent | 317958d27bda023f5cab5d811910baaa931ae7a2 (diff) | |
| download | nixpkgs-803f9cce9d90d5e67b88d08409092472ad565c4b.tar nixpkgs-803f9cce9d90d5e67b88d08409092472ad565c4b.tar.gz nixpkgs-803f9cce9d90d5e67b88d08409092472ad565c4b.tar.bz2 nixpkgs-803f9cce9d90d5e67b88d08409092472ad565c4b.tar.lz nixpkgs-803f9cce9d90d5e67b88d08409092472ad565c4b.tar.xz nixpkgs-803f9cce9d90d5e67b88d08409092472ad565c4b.tar.zst nixpkgs-803f9cce9d90d5e67b88d08409092472ad565c4b.zip | |
fltk: Don't use libGLU_combined
| -rw-r--r-- | pkgs/development/libraries/fltk/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/fltk/default.nix b/pkgs/development/libraries/fltk/default.nix index a22b5eef8d2..6f185e38d83 100644 --- a/pkgs/development/libraries/fltk/default.nix +++ b/pkgs/development/libraries/fltk/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, xlibsWrapper, xorgproto, libXi -, freeglut, libGLU_combined, libjpeg, zlib, libXft, libpng +, freeglut, libGL, libGLU, libjpeg, zlib, libXft, libpng , libtiff, freetype, Cocoa, AGL, GLUT }: @@ -19,7 +19,7 @@ stdenv.mkDerivation { patches = stdenv.lib.optionals stdenv.isDarwin [ ./nsosv.patch ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libGLU_combined libjpeg zlib libpng libXft ] + buildInputs = [ libGLU libGL libjpeg zlib libpng libXft ] ++ stdenv.lib.optional stdenv.isDarwin [ AGL Cocoa GLUT ]; propagatedBuildInputs = [ xorgproto ] |