about summary refs log tree commit diff
path: root/pkgs/development/web
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/web
parent200bb8c977d81ebdf847d5e6839cd46cd3eb8d4d (diff)
downloadnixlib-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/web')
-rw-r--r--pkgs/development/web/kcgi/default.nix4
-rw-r--r--pkgs/development/web/nodejs/nodejs.nix6
-rw-r--r--pkgs/development/web/valum/default.nix4
-rw-r--r--pkgs/development/web/woff2/default.nix4
4 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/development/web/kcgi/default.nix b/pkgs/development/web/kcgi/default.nix
index 152094b4498b..6c68f0d18e21 100644
--- a/pkgs/development/web/kcgi/default.nix
+++ b/pkgs/development/web/kcgi/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, pkgconfig, fetchFromGitHub, libbsd }:
+{ lib, stdenv, pkg-config, fetchFromGitHub, libbsd }:
 
 stdenv.mkDerivation rec {
   pname = "kcgi";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     --replace /usr/local /
   '';
   
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ ] ++ stdenv.lib.optionals stdenv.isLinux [ libbsd ] ;
 
   dontAddPrefix = true;
diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix
index 4358d6134e82..5308149c26bb 100644
--- a/pkgs/development/web/nodejs/nodejs.nix
+++ b/pkgs/development/web/nodejs/nodejs.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, openssl, python, zlib, libuv, util-linux, http-parser
-, pkgconfig, which
+, pkg-config, which
 # Updater dependencies
 , writeScript, coreutils, gnugrep, jq, curl, common-updater-scripts, nix, runtimeShell
 , gnupg
@@ -28,7 +28,7 @@ let
     "--shared-${name}-libpath=${getLib sharedLibDeps.${name}}/lib"
     /** Closure notes: we explicitly avoid specifying --shared-*-includes,
      *  as that would put the paths into bin/nodejs.
-     *  Including pkgconfig in build inputs would also have the same effect!
+     *  Including pkg-config in build inputs would also have the same effect!
      */
   ]) (builtins.attrNames sharedLibDeps) ++ [
     "--with-intl=system-icu"
@@ -55,7 +55,7 @@ in
     buildInputs = optionals stdenv.isDarwin [ CoreServices ApplicationServices ]
       ++ [ zlib libuv openssl http-parser icu ];
 
-    nativeBuildInputs = [ which util-linux pkgconfig python ]
+    nativeBuildInputs = [ which util-linux pkg-config python ]
       ++ optionals stdenv.isDarwin [ xcbuild ];
 
     configureFlags = let
diff --git a/pkgs/development/web/valum/default.nix b/pkgs/development/web/valum/default.nix
index 59db90741d34..847943d83bcf 100644
--- a/pkgs/development/web/valum/default.nix
+++ b/pkgs/development/web/valum/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, meson, ninja, pkgconfig, fetchFromGitHub, glib, vala, ctpl
+{ lib, stdenv, meson, ninja, pkg-config, fetchFromGitHub, glib, vala, ctpl
 , libgee, libsoup, fcgi }:
 
 stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "15lnk91gykm60rv31x3r1swp2bhzl3gwp12mf39smzi4bmf7h38f";
   };
 
-  nativeBuildInputs = [ meson ninja pkgconfig ];
+  nativeBuildInputs = [ meson ninja pkg-config ];
   buildInputs = [ glib vala ctpl libgee libsoup fcgi ];
 
   meta = with lib; {
diff --git a/pkgs/development/web/woff2/default.nix b/pkgs/development/web/woff2/default.nix
index fd296d37f87e..b264b216298a 100644
--- a/pkgs/development/web/woff2/default.nix
+++ b/pkgs/development/web/woff2/default.nix
@@ -1,4 +1,4 @@
-{ brotli, cmake, pkgconfig, fetchFromGitHub, lib, stdenv
+{ brotli, cmake, pkg-config, fetchFromGitHub, lib, stdenv
 , static ? stdenv.hostPlatform.isStatic
 }:
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   # Need to explicitly link to brotlicommon
   patches = stdenv.lib.optional static ./brotli-static.patch;
 
-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [ cmake pkg-config ];
 
   cmakeFlags = [
     "-DCANONICAL_PREFIXES=ON"