public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: explicitly specify gtk version

Browse Source
This commit is contained in:
Kirill Boltaev
2016-09-13 20:42:55 +03:00
parent 4b55b0358a
commit 0f37287df5
19 changed files with 52 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/tools/analysis/radare/default.nix
View File

@@ -1,10 +1,10 @@
{stdenv, fetchurl, pkgconfig, libusb, readline, lua, libewf, perl,
gtk ? null, vte ? null, gtkdialog ? null,
gtk2 ? null, vte ? null, gtkdialog ? null,
python ? null,
ruby ? null,
useX11, rubyBindings, pythonBindings, luaBindings}:
assert useX11 -> (gtk != null && vte != null && gtkdialog != null);
assert useX11 -> (gtk2 != null && vte != null && gtkdialog != null);
assert rubyBindings -> ruby != null;
assert pythonBindings -> python != null;
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ];
buildInputs = [pkgconfig readline libusb perl]
++ optional useX11 [gtkdialog vte gtk]
++ optional useX11 [gtkdialog vte gtk2]
++ optional rubyBindings [ruby]
++ optional pythonBindings [python]
++ optional luaBindings [lua];

6
pkgs/development/tools/analysis/radare2/default.nix
View File

@@ -1,11 +1,11 @@
{stdenv, fetchurl, pkgconfig, libusb, readline, libewf, perl, zlib, openssl,
gtk ? null, vte ? null, gtkdialog ? null,
gtk2 ? null, vte ? null, gtkdialog ? null,
python ? null,
ruby ? null,
lua ? null,
useX11, rubyBindings, pythonBindings, luaBindings}:
assert useX11 -> (gtk != null && vte != null && gtkdialog != null);
assert useX11 -> (gtk2 != null && vte != null && gtkdialog != null);
assert rubyBindings -> ruby != null;
assert pythonBindings -> python != null;
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
buildInputs = [pkgconfig readline libusb libewf perl zlib openssl]
++ optional useX11 [gtkdialog vte gtk]
++ optional useX11 [gtkdialog vte gtk2]
++ optional rubyBindings [ruby]
++ optional pythonBindings [python]
++ optional luaBindings [lua];