mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-18 07:46:09 +01:00
openocd: 0.11.0-rc1 -> 0.11.0
This commit is contained in:
parent
d83286570c
commit
71e1536f10
2 changed files with 8 additions and 14 deletions
|
@ -1,7 +1,6 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchgit
|
||||
, autoreconfHook
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, hidapi
|
||||
, libftdi1
|
||||
|
@ -10,16 +9,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "openocd";
|
||||
version = "0.11.0-rc1";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.code.sf.net/p/openocd/code";
|
||||
rev = "v${version}";
|
||||
sha256 = "15g8qalyxhdp0imfrg8mxwnp0nimd836fc5laaavajw49gcm65m4";
|
||||
fetchSubmodules = true;
|
||||
version = "0.11.0";
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/project/${pname}/${pname}/${version}/${pname}-${version}.tar.bz2";
|
||||
sha256 = "0z8y7mmv0mhn2l5gs3vz6l7cnwak7agklyc7ml33f7gz99rwx8s3";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [ hidapi libftdi1 libusb1 ];
|
||||
|
||||
|
@ -64,7 +60,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
homepage = "https://openocd.sourceforge.net/";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ bjornfor ];
|
||||
maintainers = with maintainers; [ bjornfor prusnak ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -12771,9 +12771,7 @@ in
|
|||
|
||||
opengrok = callPackage ../development/tools/misc/opengrok { };
|
||||
|
||||
openocd = callPackage ../development/tools/misc/openocd {
|
||||
autoreconfHook = buildPackages.autoreconfHook269;
|
||||
};
|
||||
openocd = callPackage ../development/tools/misc/openocd { };
|
||||
|
||||
oprofile = callPackage ../development/tools/profiling/oprofile {
|
||||
libiberty_static = libiberty.override { staticBuild = true; };
|
||||
|
|
Loading…
Reference in a new issue