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/gegl | |
| parent | 200bb8c977d81ebdf847d5e6839cd46cd3eb8d4d (diff) | |
| download | nixlib-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/libraries/gegl')
| -rw-r--r-- | pkgs/development/libraries/gegl/4.0.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/gegl/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/libraries/gegl/4.0.nix b/pkgs/development/libraries/gegl/4.0.nix index c25f9145ea5e..4852db0dac3f 100644 --- a/pkgs/development/libraries/gegl/4.0.nix +++ b/pkgs/development/libraries/gegl/4.0.nix @@ -1,7 +1,7 @@ { stdenv , fetchurl , fetchpatch -, pkgconfig +, pkg-config , vala , gobject-introspection , gtk-doc @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config gettext meson ninja diff --git a/pkgs/development/libraries/gegl/default.nix b/pkgs/development/libraries/gegl/default.nix index a99ec05d771c..93adb49d8b70 100644 --- a/pkgs/development/libraries/gegl/default.nix +++ b/pkgs/development/libraries/gegl/default.nix @@ -1,6 +1,6 @@ { stdenv , fetchurl -, pkgconfig +, pkg-config , babl , libpng , cairo @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { buildInputs = [ babl libpng cairo libjpeg librsvg pango gtk2 bzip2 intltool libintl ] ++ stdenv.lib.optional stdenv.isDarwin OpenGL; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; doCheck = false; # fails 3 out of 19 tests |