diff options
author | Andreas Wagner <andreas.wagner@lowfatcomputing.org> | 2015-09-22 07:18:08 -0400 |
---|---|---|
committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2015-09-23 21:03:11 +0200 |
commit | 23ed438d5a474ff17593693213c94d71826fce3f (patch) | |
tree | f41397f181e64d7748746c3e46dc124acdbc4369 | |
parent | 52379183e15fffa8fb2e0f138110d00a0e4e3be5 (diff) |
urjtag: enable various features
[Bjørn: commit message: enabled -> enable]
-rw-r--r-- | pkgs/tools/misc/urjtag/default.nix | 16 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 13 insertions, 7 deletions
diff --git a/pkgs/tools/misc/urjtag/default.nix b/pkgs/tools/misc/urjtag/default.nix index 7b7d52bcb3fa4..59153e68a56ce 100644 --- a/pkgs/tools/misc/urjtag/default.nix +++ b/pkgs/tools/misc/urjtag/default.nix @@ -1,8 +1,10 @@ { stdenv, autoconf, automake, pkgconfig, gettext, intltool, libtool, bison -, flex, which, subversion, fetchsvn, makeWrapper +, flex, which, subversion, fetchsvn, makeWrapper, libftdi, libusb, readline +, python3 +, svfSupport ? false +, bsdlSupport ? false +, staplSupport ? false , jedecSupport ? false -, pythonBindings ? false -, python3 ? null }: stdenv.mkDerivation rec { @@ -15,12 +17,14 @@ stdenv.mkDerivation rec { sha256 = "0pyl0y27136nr8mmjdml7zjnfnpbjmgqzkjk99j3hvj38k10wq7f"; }; - buildInputs = [ gettext pkgconfig autoconf automake libtool bison flex which subversion makeWrapper ] - ++ stdenv.lib.optional pythonBindings python3; + buildInputs = [ gettext pkgconfig autoconf automake libtool bison flex which + subversion makeWrapper readline libftdi libusb python3 ]; configureFlags = '' + ${if svfSupport then "--enable-svf" else "--disable-svf"} + ${if bsdlSupport then "--enable-bsdl" else "--disable-bsdl"} + ${if staplSupport then "--enable-stapl" else "--disable-stapl"} ${if jedecSupport then "--enable-jedec-exp" else "--disable-jedec-exp"} - ${if pythonBindings then "--enable-python" else "--disable-python"} ''; preConfigure = "./autogen.sh"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index be92929e65877..851c06e37f16a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3406,8 +3406,10 @@ let uptimed = callPackage ../tools/system/uptimed { }; urjtag = callPackage ../tools/misc/urjtag { + svfSupport = true; + bsdlSupport = true; + staplSupport = true; jedecSupport = true; - pythonBindings = true; }; urlwatch = callPackage ../tools/networking/urlwatch { }; |