summary refs log tree commit diff
path: root/pkgs/development/libraries/fltk
diff options
context:
space:
mode:
authorJonathan Ringer <jonringer117@gmail.com>2021-01-18 22:50:56 -0800
committerJonathan Ringer <jonringer@users.noreply.github.com>2021-01-19 01:16:25 -0800
commit9bb3fccb5b55326cb3c2c507464a8a28d44d1730 (patch)
tree9d1c0c16cce5e5dcc08115230f6412865487964b /pkgs/development/libraries/fltk
parent200bb8c977d81ebdf847d5e6839cd46cd3eb8d4d (diff)
downloadnixpkgs-9bb3fccb5b55326cb3c2c507464a8a28d44d1730.tar
nixpkgs-9bb3fccb5b55326cb3c2c507464a8a28d44d1730.tar.gz
nixpkgs-9bb3fccb5b55326cb3c2c507464a8a28d44d1730.tar.bz2
nixpkgs-9bb3fccb5b55326cb3c2c507464a8a28d44d1730.tar.lz
nixpkgs-9bb3fccb5b55326cb3c2c507464a8a28d44d1730.tar.xz
nixpkgs-9bb3fccb5b55326cb3c2c507464a8a28d44d1730.tar.zst
nixpkgs-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')
-rw-r--r--pkgs/development/libraries/fltk/1.4.nix4
-rw-r--r--pkgs/development/libraries/fltk/default.nix4
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/libraries/fltk/1.4.nix b/pkgs/development/libraries/fltk/1.4.nix
index c40a75edc09..4c482176fcb 100644
--- a/pkgs/development/libraries/fltk/1.4.nix
+++ b/pkgs/development/libraries/fltk/1.4.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, xlibsWrapper, xorgproto, libXi
+{ stdenv, fetchurl, pkg-config, xlibsWrapper, xorgproto, libXi
 , freeglut, libGLU, libGL, 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 ];
 
diff --git a/pkgs/development/libraries/fltk/default.nix b/pkgs/development/libraries/fltk/default.nix
index ad4736533cf..ca8198fb271 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 ];