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/mobile | |
parent | 200bb8c977d81ebdf847d5e6839cd46cd3eb8d4d (diff) |
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/mobile')
-rw-r--r-- | pkgs/development/mobile/adbfs-rootless/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/mobile/webos/novacom.nix | 4 | ||||
-rw-r--r-- | pkgs/development/mobile/webos/novacomd.nix | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/mobile/adbfs-rootless/default.nix b/pkgs/development/mobile/adbfs-rootless/default.nix index f562adb1dd054..85bf2fb44906c 100644 --- a/pkgs/development/mobile/adbfs-rootless/default.nix +++ b/pkgs/development/mobile/adbfs-rootless/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, pkgconfig, fuse, adb }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, fuse, adb }: stdenv.mkDerivation rec { pname = "adbfs-rootless"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ fuse ]; postPatch = '' diff --git a/pkgs/development/mobile/webos/novacom.nix b/pkgs/development/mobile/webos/novacom.nix index 08f25a53bf689..eca29dd2fabdc 100644 --- a/pkgs/development/mobile/webos/novacom.nix +++ b/pkgs/development/mobile/webos/novacom.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, webos, cmake, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, webos, cmake, pkg-config }: stdenv.mkDerivation rec { pname = "novacom"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "12s6g7l20kakyjlhqpli496miv2kfsdp17lcwhdrzdxvxl6hnf4n"; }; - nativeBuildInputs = [ cmake pkgconfig webos.cmake-modules ]; + nativeBuildInputs = [ cmake pkg-config webos.cmake-modules ]; postInstall = '' install -Dm755 -t $out/bin ../scripts/novaterm diff --git a/pkgs/development/mobile/webos/novacomd.nix b/pkgs/development/mobile/webos/novacomd.nix index c39f36b93f688..dc330ce6d4e97 100644 --- a/pkgs/development/mobile/webos/novacomd.nix +++ b/pkgs/development/mobile/webos/novacomd.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, -webos, cmake, pkgconfig, +webos, cmake, pkg-config, libusb-compat-0_1 }: stdenv.mkDerivation rec { @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ cmake pkgconfig webos.cmake-modules ]; + nativeBuildInputs = [ cmake pkg-config webos.cmake-modules ]; buildInputs = [ libusb-compat-0_1 ]; |