diff options
author | Andreas Wagner <andreas.wagner@lowfatcomputing.org> | 2015-09-09 05:04:47 -0400 |
---|---|---|
committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2015-09-23 20:59:37 +0200 |
commit | 52379183e15fffa8fb2e0f138110d00a0e4e3be5 (patch) | |
tree | b217fdaa6bad58a1e198cb8c4b0276f8fbedb175 | |
parent | 735f0f2ca8b9da0791554a6335f2f0b1238ffad8 (diff) |
urjtag: path fixes, use svn to get version string
If built from svn: $ jtag --version UrJTAG 0.10 #2051 If built from git: $ jtag --version UrJTAG 0.10 # Also, with svn we don't need to download the web/ subdirectory because svn supports partial repository clones. [Bjørn: extend commit message]
-rw-r--r-- | pkgs/tools/misc/urjtag/default.nix | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/pkgs/tools/misc/urjtag/default.nix b/pkgs/tools/misc/urjtag/default.nix index 589f7d9a94b7a..7b7d52bcb3fa4 100644 --- a/pkgs/tools/misc/urjtag/default.nix +++ b/pkgs/tools/misc/urjtag/default.nix @@ -1,5 +1,5 @@ { stdenv, autoconf, automake, pkgconfig, gettext, intltool, libtool, bison -, flex, fetchgit, makeWrapper +, flex, which, subversion, fetchsvn, makeWrapper , jedecSupport ? false , pythonBindings ? false , python3 ? null @@ -9,23 +9,21 @@ stdenv.mkDerivation rec { version = "0.10"; name = "urjtag-${version}"; - src = fetchgit { - url = "git://git.code.sf.net/p/urjtag/git"; - rev = "7ba12da7845af7601e014a2a107670edc5d6997d"; - sha256 = "834401d851728c48f1c055d24dc83b6173c701bf352d3a964ec7ff1aff3abf6a"; + src = fetchsvn { + url = "svn://svn.code.sf.net/p/urjtag/svn/trunk/urjtag"; + rev = "2051"; + sha256 = "0pyl0y27136nr8mmjdml7zjnfnpbjmgqzkjk99j3hvj38k10wq7f"; }; - buildInputs = [ gettext pkgconfig autoconf automake libtool makeWrapper ] + buildInputs = [ gettext pkgconfig autoconf automake libtool bison flex which subversion makeWrapper ] ++ stdenv.lib.optional pythonBindings python3; configureFlags = '' - --prefix=/ ${if jedecSupport then "--enable-jedec-exp" else "--disable-jedec-exp"} ${if pythonBindings then "--enable-python" else "--disable-python"} ''; - preConfigure = "cd urjtag; ./autogen.sh"; - makeFlags = [ "DESTDIR=$(out)" ]; + preConfigure = "./autogen.sh"; meta = { description = "Enhanced, modern tool for communicating over JTAG with flash chips, CPUs,and many more"; |