diff --git a/pkgs/assaultcube/default.nix b/pkgs/assaultcube/default.nix index 86c7f60..914af52 100644 --- a/pkgs/assaultcube/default.nix +++ b/pkgs/assaultcube/default.nix @@ -3,7 +3,7 @@ , stdenv , makeDesktopItem , openal -, pkgconfig +, pkg-config , libogg , libvorbis , SDL @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { # was useless before someone broke SDL_image, see https://github.com/NixOS/nixpkgs/pull/97919/ NIX_LDFLAGS = "-lpng -ljpeg"; - nativeBuildInputs = [ makeWrapper pkgconfig ]; + nativeBuildInputs = [ makeWrapper pkg-config ]; buildInputs = [ file zlib ] ++ optionals client [ openal SDL SDL_image libogg libvorbis libjpeg_turbo libpng ]; diff --git a/pkgs/caprice32/default.nix b/pkgs/caprice32/default.nix index 2bba408..a1036c1 100644 --- a/pkgs/caprice32/default.nix +++ b/pkgs/caprice32/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , desktop-file-utils , libpng -, pkgconfig +, pkg-config , SDL2 , freetype , zlib @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-bO1HJxNp9+aFukvtaoz9WrB6y21ok3Dxu+CpyoRf+2Q="; }; - nativeBuildInputs = [ desktop-file-utils pkgconfig ]; + nativeBuildInputs = [ desktop-file-utils pkg-config ]; buildInputs = [ libpng SDL2 freetype zlib ]; makeFlags = [ diff --git a/pkgs/freediag/default.nix b/pkgs/freediag/default.nix index 273e5a4..21b1e05 100644 --- a/pkgs/freediag/default.nix +++ b/pkgs/freediag/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchFromGitHub , cmake -, pkgconfig +, pkg-config , enableGUI ? false , libGLU_combined ? null , fltk ? null @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { sha256 = "0krwbz9jnyzjwmjkx1ffh7v3qk8r2xd4lg3jm9mqxyiw780r4n4s"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = optionals enableGUI [ libGLU_combined fltk ]; cmakeFlags = optional enableGUI [ "-DBUILD_GUI=1" ]; diff --git a/pkgs/magick2cpc/default.nix b/pkgs/magick2cpc/default.nix index 331110a..9478bf3 100644 --- a/pkgs/magick2cpc/default.nix +++ b/pkgs/magick2cpc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, imagemagick6, pkgconfig, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, imagemagick6, pkg-config, autoreconfHook }: stdenv.mkDerivation rec { name = "magick2cpc-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "16412i9skdmi9a297dxwr6817wfwafbpx4vxfkks9pwx2jcmp75j"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ imagemagick6 ]; meta = with lib; { diff --git a/pkgs/mkpsxiso/default.nix b/pkgs/mkpsxiso/default.nix index e349af3..f17ba6b 100644 --- a/pkgs/mkpsxiso/default.nix +++ b/pkgs/mkpsxiso/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, tinyxml2 }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, tinyxml2 }: stdenv.mkDerivation rec { pname = "mkpsxiso"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { #''; buildInputs = [ tinyxml2 ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; #cmakeFlags = [ # "-DTINYXML_INCLUDE_DIR=${tinyxml}/include" # "-DTINYXML_LIBRARIES=${tinyxml}/lib" diff --git a/pkgs/navit/default.nix b/pkgs/navit/default.nix index 796eb93..1a375ab 100644 --- a/pkgs/navit/default.nix +++ b/pkgs/navit/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchFromGitHub -, pkgconfig +, pkg-config , fontconfig , freetype , imlib2 @@ -13,13 +13,13 @@ , librsvg #inkscape , libxslt , cairo -, gdk_pixbuf +, gdk-pixbuf , pango , atk , patchelf , fetchurl , bzip2 -, python +, python3 , gettext , libpng , zlib @@ -120,12 +120,12 @@ stdenv.mkDerivation rec { "-DCMAKE_RC_COMPILER=${stdenv.cc.targetPrefix}windres" ]; - nativeBuildInputs = [ gettext makeWrapper pkgconfig cmake patchelf bzip2 libxslt ] + nativeBuildInputs = [ gettext makeWrapper pkg-config cmake patchelf bzip2 libxslt ] ++ optional stdenv.targetPlatform.isMinGW nsis; buildInputs = [ libpng zlib ] ++ optionals stdenv.hostPlatform.isLinux [ - python + python3 gd freetype fribidi @@ -136,7 +136,7 @@ stdenv.mkDerivation rec { gpsd shapelib ] - ++ optionals gtkSupport [ atk cairo gtk2 gdk_pixbuf pango imlib2 ] + ++ optionals gtkSupport [ atk cairo gtk2 gdk-pixbuf pango imlib2 ] ++ optionals sdlSupport [ SDL SDL_image ] ++ optionals qtSupport [ qtquickcontrols diff --git a/pkgs/nsntrace/default.nix b/pkgs/nsntrace/default.nix index 7392729..4320ab7 100644 --- a/pkgs/nsntrace/default.nix +++ b/pkgs/nsntrace/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, iptables, libpcap, libxslt, libnl }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, iptables, libpcap, libxslt, libnl }: stdenv.mkDerivation rec { version = "unstable-2020-05-25"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1650h49gr8dn2z9m7cglg8whvyc7isf071aqbxz2zxlq432858y7"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ iptables libnl libpcap libxslt ]; #very ugly for now diff --git a/pkgs/quickbms/default.nix b/pkgs/quickbms/default.nix index 14917f9..48ca34b 100644 --- a/pkgs/quickbms/default.nix +++ b/pkgs/quickbms/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, unzip, lzo, bzip2, zlib, openssl }: +{ lib, stdenv, fetchurl, pkg-config, unzip, lzo, bzip2, zlib, openssl }: stdenv.mkDerivation rec { version = "0.10.1"; diff --git a/pkgs/scriptcommunicator/default.nix b/pkgs/scriptcommunicator/default.nix index 301d7c5..30ceb8f 100644 --- a/pkgs/scriptcommunicator/default.nix +++ b/pkgs/scriptcommunicator/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchFromGitHub , qmake -, pkgconfig +, pkg-config , libpng , zlib , unzip