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/v8 | |
| parent | 200bb8c977d81ebdf847d5e6839cd46cd3eb8d4d (diff) | |
| download | nixpkgs-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/v8')
| -rw-r--r-- | pkgs/development/libraries/v8/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/v8/plv8_6_x.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index e6696626cb5..40c551d826a 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchgit, fetchFromGitHub -, gn, ninja, python, glib, pkgconfig, icu +, gn, ninja, python, glib, pkg-config, icu , xcbuild, darwin , fetchpatch }: @@ -101,7 +101,7 @@ stdenv.mkDerivation rec { # to be exceeded NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isGNU "-Wno-class-memaccess"; - nativeBuildInputs = [ gn ninja pkgconfig python ] + nativeBuildInputs = [ gn ninja pkg-config python ] ++ stdenv.lib.optionals stdenv.isDarwin [ xcbuild darwin.DarwinTools ]; buildInputs = [ glib icu ]; diff --git a/pkgs/development/libraries/v8/plv8_6_x.nix b/pkgs/development/libraries/v8/plv8_6_x.nix index 782d324c8be..71e14a82c3e 100644 --- a/pkgs/development/libraries/v8/plv8_6_x.nix +++ b/pkgs/development/libraries/v8/plv8_6_x.nix @@ -4,7 +4,7 @@ # 2019-08-29, nixpkgs does not have v8 6.x, and v8_5 is bumped to 5.4.232, which # is a bit outdated. plv8 3.x is planned to support v8 7.x -{ stdenv, lib, fetchgit, fetchFromGitHub, gn, ninja, python, glib, pkgconfig +{ stdenv, lib, fetchgit, fetchFromGitHub, gn, ninja, python, glib, pkg-config , doCheck ? false , snapshot ? true }: @@ -158,7 +158,7 @@ stdenv.mkDerivation rec { use_custom_libcxx_for_host=false ''; - nativeBuildInputs = [ gn ninja pkgconfig ]; + nativeBuildInputs = [ gn ninja pkg-config ]; buildInputs = [ python glib ]; buildPhase = '' |