diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-02-07 15:19:21 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-02-07 23:35:47 +0000 |
| commit | e5013c05a2f845255debf94318ab38ecef1c186b (patch) | |
| tree | bec11a0bd31d3432a16899e5539f1098f1c168a4 /nixpkgs/pkgs/development/libraries/fltk | |
| parent | 4fc07c92ec07cafcf6d56143ea7334693143ef88 (diff) | |
| parent | 2d2f10475138b7206572dc3ec288184df2be022e (diff) | |
| download | nixlib-e5013c05a2f845255debf94318ab38ecef1c186b.tar nixlib-e5013c05a2f845255debf94318ab38ecef1c186b.tar.gz nixlib-e5013c05a2f845255debf94318ab38ecef1c186b.tar.bz2 nixlib-e5013c05a2f845255debf94318ab38ecef1c186b.tar.lz nixlib-e5013c05a2f845255debf94318ab38ecef1c186b.tar.xz nixlib-e5013c05a2f845255debf94318ab38ecef1c186b.tar.zst nixlib-e5013c05a2f845255debf94318ab38ecef1c186b.zip | |
Merge commit '2d2f10475138b7206572dc3ec288184df2be022e'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/fltk')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/fltk/1.4.nix | 4 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/fltk/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/development/libraries/fltk/1.4.nix b/nixpkgs/pkgs/development/libraries/fltk/1.4.nix index 5d6397c6a1b6..3cdebe184d7e 100644 --- a/nixpkgs/pkgs/development/libraries/fltk/1.4.nix +++ b/nixpkgs/pkgs/development/libraries/fltk/1.4.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, xlibsWrapper, inputproto, libXi +{ stdenv, fetchurl, pkgconfig, xlibsWrapper, xorgproto, libXi , freeglut, libGLU_combined, libjpeg, zlib, libXft, libpng , libtiff, freetype, cf-private, Cocoa, AGL, GLUT }: @@ -35,7 +35,7 @@ in stdenv.mkDerivation { "--enable-xft" ]; - propagatedBuildInputs = [ inputproto ] + propagatedBuildInputs = [ xorgproto ] ++ (if stdenv.isDarwin then [ Cocoa AGL GLUT freetype libtiff cf-private /* Needed for NSDefaultRunLoopMode */ ] else [ xlibsWrapper libXi freeglut ]); diff --git a/nixpkgs/pkgs/development/libraries/fltk/default.nix b/nixpkgs/pkgs/development/libraries/fltk/default.nix index b1c798476ead..270936a91b9f 100644 --- a/nixpkgs/pkgs/development/libraries/fltk/default.nix +++ b/nixpkgs/pkgs/development/libraries/fltk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, xlibsWrapper, inputproto, libXi +{ stdenv, fetchurl, pkgconfig, xlibsWrapper, xorgproto, libXi , freeglut, libGLU_combined, libjpeg, zlib, libXft, libpng , libtiff, freetype, cf-private, Cocoa, AGL, GLUT }: @@ -33,7 +33,7 @@ in stdenv.mkDerivation { "--enable-xft" ]; - propagatedBuildInputs = [ inputproto ] + propagatedBuildInputs = [ xorgproto ] ++ (if stdenv.isDarwin then [ Cocoa AGL GLUT freetype libtiff cf-private /* Needed for NSDefaultRunLoopMode */ ] else [ xlibsWrapper libXi freeglut ]); |