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/smpeg | |
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/libraries/smpeg')
-rw-r--r-- | pkgs/development/libraries/smpeg/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/libraries/smpeg/default.nix b/pkgs/development/libraries/smpeg/default.nix index 3a34bf54c3cbc..335712ac35a1e 100644 --- a/pkgs/development/libraries/smpeg/default.nix +++ b/pkgs/development/libraries/smpeg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, SDL, autoconf, automake, libtool, gtk2, m4, pkgconfig, libGLU, libGL, makeWrapper }: +{ stdenv, fetchsvn, SDL, autoconf, automake, libtool, gtk2, m4, pkg-config, libGLU, libGL, makeWrapper }: stdenv.mkDerivation rec { name = "smpeg-svn${version}"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ SDL gtk2 libGLU libGL ]; - nativeBuildInputs = [ autoconf automake libtool m4 pkgconfig makeWrapper ]; + nativeBuildInputs = [ autoconf automake libtool m4 pkg-config makeWrapper ]; preConfigure = '' touch NEWS AUTHORS ChangeLog @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { $out/include/smpeg/*.h wrapProgram $out/bin/smpeg-config \ - --prefix PATH ":" "${pkgconfig}/bin" \ + --prefix PATH ":" "${pkg-config}/bin" \ --prefix PKG_CONFIG_PATH ":" "${SDL.dev}/lib/pkgconfig" ''; |