diff options
author | Ben Siraphob <bensiraphob@gmail.com> | 2021-01-22 00:00:13 +0700 |
---|---|---|
committer | Jonathan Ringer <jonringer@users.noreply.github.com> | 2021-01-21 19:11:02 -0800 |
commit | 66e44425c6dfecbea68a5d6dc221ccd56561d4f1 (patch) | |
tree | 0a5bf7d41356ad47b4e6f0a737bf16c9a4a5b01e /pkgs/development/libraries/fltk | |
parent | 046d24424ef32cca1227519f93f41b5ec8133f31 (diff) | |
download | nixpkgs-66e44425c6dfecbea68a5d6dc221ccd56561d4f1.tar nixpkgs-66e44425c6dfecbea68a5d6dc221ccd56561d4f1.tar.gz nixpkgs-66e44425c6dfecbea68a5d6dc221ccd56561d4f1.tar.bz2 nixpkgs-66e44425c6dfecbea68a5d6dc221ccd56561d4f1.tar.lz nixpkgs-66e44425c6dfecbea68a5d6dc221ccd56561d4f1.tar.xz nixpkgs-66e44425c6dfecbea68a5d6dc221ccd56561d4f1.tar.zst nixpkgs-66e44425c6dfecbea68a5d6dc221ccd56561d4f1.zip |
pkgs/development/libraries: stdenv.lib -> lib
Diffstat (limited to 'pkgs/development/libraries/fltk')
-rw-r--r-- | pkgs/development/libraries/fltk/1.4.nix | 8 | ||||
-rw-r--r-- | pkgs/development/libraries/fltk/default.nix | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/development/libraries/fltk/1.4.nix b/pkgs/development/libraries/fltk/1.4.nix index 4c482176fcb..2db0aea3ecf 100644 --- a/pkgs/development/libraries/fltk/1.4.nix +++ b/pkgs/development/libraries/fltk/1.4.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, 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 = [ 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/pkgs/development/libraries/fltk/default.nix b/pkgs/development/libraries/fltk/default.nix index ca8198fb271..5cbd993fc64 100644 --- a/pkgs/development/libraries/fltk/default.nix +++ b/pkgs/development/libraries/fltk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, 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 = [ 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; |