pkgs/tools: pkgconfig -> pkg-config
This commit is contained in:
committed by
Jonathan Ringer
parent
fce00d15c2
commit
76f93cc731
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, fetchpatch, libpcap, pkgconfig, openssl, lua5_3
|
||||
{ lib, stdenv, fetchurl, fetchpatch, libpcap, pkg-config, openssl, lua5_3
|
||||
, pcre, liblinear, libssh2
|
||||
, graphicalSupport ? false
|
||||
, libX11 ? null
|
||||
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
|
||||
pygtk pysqlite pygobject2 pycairo
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ] ++ optionals graphicalSupport [ python2.pkgs.wrapPython ];
|
||||
nativeBuildInputs = [ pkg-config ] ++ optionals graphicalSupport [ python2.pkgs.wrapPython ];
|
||||
buildInputs = [ pcre liblinear libssh2 libpcap openssl ] ++ optionals graphicalSupport (with python2.pkgs; [
|
||||
python2 libX11 gtk2
|
||||
]);
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{ lib, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkgconfig
|
||||
, pkg-config
|
||||
, wrapQtAppsHook
|
||||
, dnsutils
|
||||
, nmap
|
||||
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-q3XfwJ4TGK4E58haN0Q0xRH4GDpKD8VZzyxHe/VwBqY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ];
|
||||
nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
|
||||
|
||||
buildInputs = [ qtbase qtscript qtwebengine ];
|
||||
|
||||
|
||||
Reference in New Issue
Block a user