about summary refs log tree commit diff
path: root/pkgs/development/tools
diff options
context:
space:
mode:
authorWill Dietz <w@wdtz.org>2018-10-16 11:57:44 -0500
committerWill Dietz <w@wdtz.org>2018-10-16 12:31:07 -0500
commitf88957d1701d08e61dc44653d34524fa930b2778 (patch)
treedba18c3d944f260b1d39e95a3d27505635f021eb /pkgs/development/tools
parent56ef6eeb43f2ea9c47701bbe4534999aca78dd34 (diff)
downloadnixlib-f88957d1701d08e61dc44653d34524fa930b2778.tar
nixlib-f88957d1701d08e61dc44653d34524fa930b2778.tar.gz
nixlib-f88957d1701d08e61dc44653d34524fa930b2778.tar.bz2
nixlib-f88957d1701d08e61dc44653d34524fa930b2778.tar.lz
nixlib-f88957d1701d08e61dc44653d34524fa930b2778.tar.xz
nixlib-f88957d1701d08e61dc44653d34524fa930b2778.tar.zst
nixlib-f88957d1701d08e61dc44653d34524fa930b2778.zip
radare2: libuv and actually use deps we're providing
Particularly openssl and zlib.
There are others we may wish to provide but for now
let's at least use the ones in buildInputs :).
Diffstat (limited to 'pkgs/development/tools')
-rw-r--r--pkgs/development/tools/analysis/radare2/default.nix6
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix
index 4a2a32bf22a4..a6dbb8e601fe 100644
--- a/pkgs/development/tools/analysis/radare2/default.nix
+++ b/pkgs/development/tools/analysis/radare2/default.nix
@@ -2,6 +2,7 @@
 , callPackage
 , ninja, meson , pkgconfig
 , libusb, readline, libewf, perl, zlib, openssl
+, libuv
 , gtk2 ? null, vte ? null, gtkdialog ? null
 , python ? null
 , ruby ? null
@@ -62,12 +63,15 @@ let
         "-Dr2_gittip=${gittip}"
         # 2.8.0 expects this, but later it becomes an option with default=false.
         "-Dcapstone_in_builddir=true"
+
+        "-Duse_sys_openssl=true"
+        "-Duse_sys_zlib=true"
       ];
 
       enableParallelBuilding = true;
 
       nativeBuildInputs = [ pkgconfig ninja meson ];
-      buildInputs = [ readline libusb libewf perl zlib openssl]
+      buildInputs = [ readline libusb libewf perl zlib openssl libuv ]
         ++ optional useX11 [gtkdialog vte gtk2]
         ++ optional rubyBindings [ruby]
         ++ optional pythonBindings [python]