Skip to content

Commit 5a45c9f

Browse files
committed
libfranka: use jrl-umi3218 fork
1 parent acdaf9e commit 5a45c9f

1 file changed

Lines changed: 8 additions & 19 deletions

File tree

pkgs/mc-rtc/robots/mc-panda/libfranka.nix

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,25 @@
11
{
22
stdenv,
33
lib,
4-
fetchgit,
4+
fetchFromGitHub,
55
cmake,
66
pkg-config,
77
eigen,
88
poco,
99
tinyxml-2,
1010
# , doxygen, graphviz
11-
useLocal ? false,
12-
localWorkspace ? null,
1311
}:
1412

1513
stdenv.mkDerivation {
1614
pname = "libfranka";
1715
version = "0.9.2";
1816

19-
src =
20-
if useLocal then
21-
builtins.trace "Using local workspace for libfranka: ${localWorkspace}/libfranka" (
22-
builtins.path {
23-
path = "${localWorkspace}/libfranka";
24-
name = "libfranka-src";
25-
}
26-
)
27-
else
28-
fetchgit {
29-
url = "https://github.com/frankarobotics/libfranka";
30-
rev = "f3b8d775a9c847cab32684c8a316f67867761674";
31-
sha256 = "sha256-xPzzJ4YlRz7MVRgcZaV3QhlOrUFlajJLaArchBylCQM=";
32-
fetchSubmodules = true;
33-
};
17+
src = fetchFromGitHub {
18+
owner = "jrl-umi3218";
19+
repo = "libfranka";
20+
rev = "2695c2626d53655175b180a5bc2d9b448e8c427f";
21+
hash = "sha256-xkpV/m1HqGOiOmurAVCeP9JkdPTopfI0/Sg/SbrU0mY=";
22+
};
3423

3524
nativeBuildInputs = [
3625
cmake
@@ -63,7 +52,7 @@ stdenv.mkDerivation {
6352
doCheck = false;
6453

6554
meta = with lib; {
66-
description = "C++ library for Franka Robotics research robots";
55+
description = "C++ library for Franka Robotics research robots for version 0.9.2 (jrl-umi3218 fork)";
6756
homepage = "https://github.com/frankarobotics/libfranka";
6857
license = licenses.asl20;
6958
platforms = platforms.linux;

0 commit comments

Comments
 (0)