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]
This commit is contained in:
Andreas Wagner 2015-09-09 05:04:47 -04:00 committed by Bjørn Forsman
parent 735f0f2ca8
commit 52379183e1

View File

@ -1,5 +1,5 @@
{ stdenv, autoconf, automake, pkgconfig, gettext, intltool, libtool, bison { stdenv, autoconf, automake, pkgconfig, gettext, intltool, libtool, bison
, flex, fetchgit, makeWrapper , flex, which, subversion, fetchsvn, makeWrapper
, jedecSupport ? false , jedecSupport ? false
, pythonBindings ? false , pythonBindings ? false
, python3 ? null , python3 ? null
@ -9,23 +9,21 @@ stdenv.mkDerivation rec {
version = "0.10"; version = "0.10";
name = "urjtag-${version}"; name = "urjtag-${version}";
src = fetchgit { src = fetchsvn {
url = "git://git.code.sf.net/p/urjtag/git"; url = "svn://svn.code.sf.net/p/urjtag/svn/trunk/urjtag";
rev = "7ba12da7845af7601e014a2a107670edc5d6997d"; rev = "2051";
sha256 = "834401d851728c48f1c055d24dc83b6173c701bf352d3a964ec7ff1aff3abf6a"; 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; ++ stdenv.lib.optional pythonBindings python3;
configureFlags = '' configureFlags = ''
--prefix=/
${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"} ${if pythonBindings then "--enable-python" else "--disable-python"}
''; '';
preConfigure = "cd urjtag; ./autogen.sh";
makeFlags = [ "DESTDIR=$(out)" ]; preConfigure = "./autogen.sh";
meta = { meta = {
description = "Enhanced, modern tool for communicating over JTAG with flash chips, CPUs,and many more"; description = "Enhanced, modern tool for communicating over JTAG with flash chips, CPUs,and many more";