pkgs/tools: pkgconfig -> pkg-config
This commit is contained in:
committed by
Jonathan Ringer
parent
fce00d15c2
commit
76f93cc731
@@ -3,7 +3,7 @@
|
||||
, httpServer ? false # build web interface for the daemon
|
||||
, client ? false # build amule remote gui
|
||||
, fetchFromGitHub, fetchpatch, stdenv, lib, zlib, wxGTK, perl, cryptopp, libupnp, gettext, libpng ? null
|
||||
, autoreconfHook, pkgconfig, makeWrapper, libX11 ? null }:
|
||||
, autoreconfHook, pkg-config, makeWrapper, libX11 ? null }:
|
||||
|
||||
assert httpServer -> libpng != null;
|
||||
assert client -> libX11 != null;
|
||||
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
|
||||
popd >/dev/null
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook gettext makeWrapper pkgconfig ];
|
||||
nativeBuildInputs = [ autoreconfHook gettext makeWrapper pkg-config ];
|
||||
|
||||
buildInputs = [
|
||||
zlib wxGTK perl cryptopp libupnp
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, bison
|
||||
, pkgconfig
|
||||
, pkg-config
|
||||
, gettext
|
||||
, desktop-file-utils
|
||||
, glib
|
||||
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
|
||||
bison
|
||||
desktop-file-utils
|
||||
gettext
|
||||
pkgconfig
|
||||
pkg-config
|
||||
];
|
||||
buildInputs = [
|
||||
glib
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# NOTE: this is rakshava's version of libtorrent, used mainly by rtorrent
|
||||
# This is NOT libtorrent-rasterbar, used by Deluge, qbitttorent, and others
|
||||
{ lib, stdenv, fetchFromGitHub, pkgconfig, autoreconfHook
|
||||
{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook
|
||||
, cppunit, openssl, libsigcxx, zlib
|
||||
}:
|
||||
|
||||
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1h5y6ab3gs20yyprdfwcw8fh1c6czs4yrdj0kf54d2vp9qwz685r";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig autoreconfHook ];
|
||||
nativeBuildInputs = [ pkg-config autoreconfHook ];
|
||||
buildInputs = [ cppunit openssl libsigcxx zlib ];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, fetchFromGitHub, pkgconfig
|
||||
{ lib, stdenv, fetchurl, fetchFromGitHub, pkg-config
|
||||
, libtool, autoconf, automake, cppunit
|
||||
, libtorrent, ncurses, libsigcxx, curl
|
||||
, zlib, openssl, xmlrpc_c
|
||||
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0hcaf1brk402caa7hhlb2r1c93mjzxkm8gb19xfl33gkp3jpf372";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
libtool autoconf automake cppunit
|
||||
libtorrent ncurses libsigcxx curl zlib openssl xmlrpc_c
|
||||
|
||||
Reference in New Issue
Block a user