pkgs/tools: pkgconfig -> pkg-config
This commit is contained in:
committed by
Jonathan Ringer
parent
fce00d15c2
commit
76f93cc731
@@ -1,5 +1,5 @@
|
||||
{ fetchFromGitHub, lib, stdenv, libunwind, libraw1394, libjpeg, libiec61883, libdv
|
||||
, libavc1394, pkgconfig, autoreconfHook }:
|
||||
, libavc1394, pkg-config, autoreconfHook }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "dvgrab-2016-05-16";
|
||||
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook pkgconfig
|
||||
autoreconfHook pkg-config
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, lib, fetchurl, gtk2, libdv, libjpeg, libpng, libX11, pkgconfig, SDL, SDL_gfx
|
||||
{ stdenv, lib, fetchurl, gtk2, libdv, libjpeg, libpng, libX11, pkg-config, SDL, SDL_gfx
|
||||
, withMinimal ? true
|
||||
}:
|
||||
|
||||
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ libdv libjpeg libpng ]
|
||||
++ lib.optionals (!withMinimal) [ gtk2 libX11 SDL SDL_gfx ];
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{ lib, stdenv, fetchurl
|
||||
, pkgconfig, libxslt, freetype, libpng, libxml2
|
||||
, pkg-config, libxslt, freetype, libpng, libxml2
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
||||
# Fixes build with GCC 6
|
||||
NIX_CFLAGS_COMPILE = "-std=c++03";
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ libxslt freetype libpng libxml2 ];
|
||||
|
||||
meta = {
|
||||
|
||||
Reference in New Issue
Block a user