diff options
Diffstat (limited to 'pkgs/development/tools/analysis/radare2')
-rw-r--r-- | pkgs/development/tools/analysis/radare2/cutter.nix | 6 | ||||
-rw-r--r-- | pkgs/development/tools/analysis/radare2/default.nix | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/tools/analysis/radare2/cutter.nix b/pkgs/development/tools/analysis/radare2/cutter.nix index d4a102ac097b..6d9543e3836f 100644 --- a/pkgs/development/tools/analysis/radare2/cutter.nix +++ b/pkgs/development/tools/analysis/radare2/cutter.nix @@ -1,6 +1,6 @@ { fetchFromGitHub, lib, mkDerivation # nativeBuildInputs -, qmake, pkgconfig +, qmake, pkg-config # Qt , qtbase, qtsvg, qtwebengine # buildInputs @@ -30,12 +30,12 @@ mkDerivation rec { --replace "include(lib_radare2.pri)" "" ''; - nativeBuildInputs = [ qmake pkgconfig python3 wrapQtAppsHook ]; + nativeBuildInputs = [ qmake pkg-config python3 wrapQtAppsHook ]; propagatedBuildInputs = [ python3.pkgs.pyside2 ]; buildInputs = [ qtbase qtsvg qtwebengine r2-for-cutter python3 ]; qmakeFlags = with python3.pkgs; [ - "CONFIG+=link_pkgconfig" + "CONFIG+=link_pkg-config" "PKGCONFIG+=r_core" # Leaving this enabled doesn't break build but generates errors # at runtime (to console) about being unable to load needed bits. diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index a3c02503b379..c6cc555e0508 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchFromGitHub , buildPackages -, pkgconfig +, pkg-config , libusb-compat-0_1, readline, libewf, perl, zlib, openssl , libuv, file, libzip, xxHash , gtk2 ? null, vte ? null, gtkdialog ? null @@ -78,7 +78,7 @@ let enableParallelBuilding = true; depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ file readline libusb-compat-0_1 libewf perl zlib openssl libuv ] ++ optional useX11 [ gtkdialog vte gtk2 ] ++ optional rubyBindings [ ruby ] |