diff options
author | Jonathan Ringer <jonringer117@gmail.com> | 2021-01-18 22:50:56 -0800 |
---|---|---|
committer | Jonathan Ringer <jonringer@users.noreply.github.com> | 2021-01-19 01:16:25 -0800 |
commit | 9bb3fccb5b55326cb3c2c507464a8a28d44d1730 (patch) | |
tree | 9d1c0c16cce5e5dcc08115230f6412865487964b /pkgs/development/libraries/fltk/default.nix | |
parent | 200bb8c977d81ebdf847d5e6839cd46cd3eb8d4d (diff) | |
download | nixlib-9bb3fccb5b55326cb3c2c507464a8a28d44d1730.tar nixlib-9bb3fccb5b55326cb3c2c507464a8a28d44d1730.tar.gz nixlib-9bb3fccb5b55326cb3c2c507464a8a28d44d1730.tar.bz2 nixlib-9bb3fccb5b55326cb3c2c507464a8a28d44d1730.tar.lz nixlib-9bb3fccb5b55326cb3c2c507464a8a28d44d1730.tar.xz nixlib-9bb3fccb5b55326cb3c2c507464a8a28d44d1730.tar.zst nixlib-9bb3fccb5b55326cb3c2c507464a8a28d44d1730.zip |
treewide: pkgs.pkgconfig -> pkgs.pkg-config, move pkgconfig to alias.nix
continuation of #109595 pkgconfig was aliased in 2018, however, it remained in all-packages.nix due to its wide usage. This cleans up the remaining references to pkgs.pkgsconfig and moves the entry to aliases.nix. python3Packages.pkgconfig remained unchanged because it's the canonical name of the upstream package on pypi.
Diffstat (limited to 'pkgs/development/libraries/fltk/default.nix')
-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 ad4736533cf0..ca8198fb271b 100644 --- a/pkgs/development/libraries/fltk/default.nix +++ b/pkgs/development/libraries/fltk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, xlibsWrapper, xorgproto, libXi +{ stdenv, fetchurl, pkg-config, xlibsWrapper, xorgproto, libXi , freeglut, libGL, libGLU, libjpeg, zlib, libXft, libpng , libtiff, freetype, Cocoa, AGL, GLUT }: @@ -18,7 +18,7 @@ stdenv.mkDerivation { patches = stdenv.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 ]; |