diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/fltk')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/fltk/1.4.nix | 10 | ||||
-rw-r--r-- | nixpkgs/pkgs/development/libraries/fltk/default.nix | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/nixpkgs/pkgs/development/libraries/fltk/1.4.nix b/nixpkgs/pkgs/development/libraries/fltk/1.4.nix index c40a75edc090..2db0aea3ecf8 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, xorgproto, libXi +{ lib, stdenv, fetchurl, pkg-config, xlibsWrapper, xorgproto, libXi , freeglut, libGLU, libGL, libjpeg, zlib, libXft, libpng , libtiff, freetype, Cocoa, AGL, GLUT }: @@ -16,11 +16,11 @@ stdenv.mkDerivation { sha256 = "1v8wxvxcbk99i82x2v5fpqg5vj8n7g8a38g30ry7nzcjn5sf3r63"; }; - patches = stdenv.lib.optionals stdenv.isDarwin [ ./nsosv.patch ]; + patches = lib.optionals stdenv.isDarwin [ ./nsosv.patch ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libGLU libGL libjpeg zlib libpng libXft ] - ++ stdenv.lib.optional stdenv.isDarwin [ AGL Cocoa GLUT ]; + ++ lib.optional stdenv.isDarwin [ AGL Cocoa GLUT ]; propagatedBuildInputs = [ xorgproto ] ++ (if stdenv.isDarwin @@ -39,7 +39,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A C++ cross-platform lightweight GUI library"; homepage = "https://www.fltk.org"; platforms = platforms.linux ++ platforms.darwin; diff --git a/nixpkgs/pkgs/development/libraries/fltk/default.nix b/nixpkgs/pkgs/development/libraries/fltk/default.nix index ad4736533cf0..5cbd993fc646 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, xorgproto, libXi +{ lib, stdenv, fetchurl, pkg-config, xlibsWrapper, xorgproto, libXi , freeglut, libGL, libGLU, libjpeg, zlib, libXft, libpng , libtiff, freetype, Cocoa, AGL, GLUT }: @@ -16,11 +16,11 @@ stdenv.mkDerivation { sha256 = "00jp24z1818k9n6nn6lx7qflqf2k13g4kxr0p8v1d37kanhb4ac7"; }; - patches = stdenv.lib.optionals stdenv.isDarwin [ ./nsosv.patch ]; + patches = lib.optionals stdenv.isDarwin [ ./nsosv.patch ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libGLU libGL libjpeg zlib libpng libXft ] - ++ stdenv.lib.optional stdenv.isDarwin [ AGL Cocoa GLUT ]; + ++ lib.optional stdenv.isDarwin [ AGL Cocoa GLUT ]; propagatedBuildInputs = [ xorgproto ] ++ (if stdenv.isDarwin @@ -37,7 +37,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A C++ cross-platform lightweight GUI library"; homepage = "https://www.fltk.org"; platforms = platforms.linux ++ platforms.darwin; |