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/applications/audio/faust | |
| 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/applications/audio/faust')
| -rw-r--r-- | pkgs/applications/audio/faust/faust1.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/audio/faust/faust2.nix | 6 | ||||
| -rw-r--r-- | pkgs/applications/audio/faust/faust2jackrust.nix | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/applications/audio/faust/faust1.nix b/pkgs/applications/audio/faust/faust1.nix index 365055523eada..6d7d2e2c2bae2 100644 --- a/pkgs/applications/audio/faust/faust1.nix +++ b/pkgs/applications/audio/faust/faust1.nix @@ -2,7 +2,7 @@ , coreutils , fetchurl , makeWrapper -, pkgconfig +, pkg-config }: with lib.strings; @@ -159,7 +159,7 @@ let stdenv.mkDerivation ((faust2ApplBase args) // { - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ makeWrapper ]; propagatedBuildInputs = [ faust ] ++ propagatedBuildInputs; diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix index 52a291603f84b..990d073528e14 100644 --- a/pkgs/applications/audio/faust/faust2.nix +++ b/pkgs/applications/audio/faust/faust2.nix @@ -2,7 +2,7 @@ , coreutils , fetchFromGitHub , makeWrapper -, pkgconfig +, pkg-config , cmake , llvm , emscripten @@ -45,7 +45,7 @@ let inherit src; - nativeBuildInputs = [ makeWrapper pkgconfig cmake vim which ]; + nativeBuildInputs = [ makeWrapper pkg-config cmake vim which ]; buildInputs = [ llvm emscripten openssl libsndfile libmicrohttpd gnutls libtasn1 p11-kit ]; @@ -168,7 +168,7 @@ let stdenv.mkDerivation ((faust2ApplBase args) // { - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ makeWrapper ]; propagatedBuildInputs = [ faust ] ++ propagatedBuildInputs; diff --git a/pkgs/applications/audio/faust/faust2jackrust.nix b/pkgs/applications/audio/faust/faust2jackrust.nix index 2562237424e55..77335da2ce792 100644 --- a/pkgs/applications/audio/faust/faust2jackrust.nix +++ b/pkgs/applications/audio/faust/faust2jackrust.nix @@ -6,7 +6,7 @@ , gcc , gnumake , openssl -, pkgconfig +, pkg-config }: @@ -14,5 +14,5 @@ faust.wrapWithBuildEnv { baseName = "faust2jackrust"; - propagatedBuildInputs = [ libjack2 cargo binutils gcc gnumake openssl pkgconfig ]; + propagatedBuildInputs = [ libjack2 cargo binutils gcc gnumake openssl pkg-config ]; } |