urjtag: enable various features

[Bjørn: commit message: enabled -> enable]
This commit is contained in:
Andreas Wagner 2015-09-22 07:18:08 -04:00 committed by Bjørn Forsman
parent 52379183e1
commit 23ed438d5a
2 changed files with 13 additions and 7 deletions

View File

@ -1,8 +1,10 @@
{ stdenv, autoconf, automake, pkgconfig, gettext, intltool, libtool, bison { 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 , jedecSupport ? false
, pythonBindings ? false
, python3 ? null
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -15,12 +17,14 @@ stdenv.mkDerivation rec {
sha256 = "0pyl0y27136nr8mmjdml7zjnfnpbjmgqzkjk99j3hvj38k10wq7f"; sha256 = "0pyl0y27136nr8mmjdml7zjnfnpbjmgqzkjk99j3hvj38k10wq7f";
}; };
buildInputs = [ gettext pkgconfig autoconf automake libtool bison flex which subversion makeWrapper ] buildInputs = [ gettext pkgconfig autoconf automake libtool bison flex which
++ stdenv.lib.optional pythonBindings python3; subversion makeWrapper readline libftdi libusb python3 ];
configureFlags = '' 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 jedecSupport then "--enable-jedec-exp" else "--disable-jedec-exp"}
${if pythonBindings then "--enable-python" else "--disable-python"}
''; '';
preConfigure = "./autogen.sh"; preConfigure = "./autogen.sh";

View File

@ -3406,8 +3406,10 @@ let
uptimed = callPackage ../tools/system/uptimed { }; uptimed = callPackage ../tools/system/uptimed { };
urjtag = callPackage ../tools/misc/urjtag { urjtag = callPackage ../tools/misc/urjtag {
svfSupport = true;
bsdlSupport = true;
staplSupport = true;
jedecSupport = true; jedecSupport = true;
pythonBindings = true;
}; };
urlwatch = callPackage ../tools/networking/urlwatch { }; urlwatch = callPackage ../tools/networking/urlwatch { };