gepetto-viewer: 5.2.0 -> 5.2.0
Diff: https://github.com/gepetto/gepetto-viewer/compare/v5.2.0...v5.2.0
This commit is contained in:
parent
5633bcff0c
commit
5dec8acb8c
@ -4,7 +4,6 @@
|
|||||||
darwin,
|
darwin,
|
||||||
doxygen,
|
doxygen,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
fetchpatch,
|
|
||||||
fontconfig,
|
fontconfig,
|
||||||
lib,
|
lib,
|
||||||
jrl-cmakemodules,
|
jrl-cmakemodules,
|
||||||
@ -21,28 +20,15 @@
|
|||||||
let
|
let
|
||||||
gepetto-viewer = stdenv.mkDerivation (finalAttrs: {
|
gepetto-viewer = stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "gepetto-viewer";
|
pname = "gepetto-viewer";
|
||||||
version = "5.1.0";
|
version = "5.2.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "gepetto";
|
owner = "gepetto";
|
||||||
repo = "gepetto-viewer";
|
repo = "gepetto-viewer";
|
||||||
rev = "v${finalAttrs.version}";
|
rev = "v${finalAttrs.version}";
|
||||||
hash = "sha256-A2J3HidG+OHJO8LpLiOEvORxDtViTdeVD85AmKkkOg8=";
|
hash = "sha256-kAQPi7bO48H0CZKz1bxfkvMiNy8RsXvRvpDK0KF7XLM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
|
||||||
# fix use of CMAKE_INSTALL_BINDIR for $bin output
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://github.com/Gepetto/gepetto-viewer/pull/230/commits/9b1b3a61da016934c3e766e6b491c1d6f3fc80d6.patch";
|
|
||||||
hash = "sha256-dpviEkOyCZpTYntZ4sCG1AvobljJphPQxg7gA6JxfWs=";
|
|
||||||
})
|
|
||||||
# fix use of CMAKE_INSTALL_FULL_INCLUDEDIR for $dev output
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://github.com/Gepetto/gepetto-viewer/pull/230/commits/4e1c2bbe063db20b605e51495e9f9eca40138cca.patch";
|
|
||||||
hash = "sha256-HrecvW1ulCSt9+DUaQVBOoDkilGRqU2+GUx7NUw7hqc=";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
(lib.cmakeBool "BUILD_PY_QCUSTOM_PLOT" (!stdenv.hostPlatform.isDarwin))
|
(lib.cmakeBool "BUILD_PY_QCUSTOM_PLOT" (!stdenv.hostPlatform.isDarwin))
|
||||||
(lib.cmakeBool "BUILD_PY_QGV" (!stdenv.hostPlatform.isDarwin))
|
(lib.cmakeBool "BUILD_PY_QGV" (!stdenv.hostPlatform.isDarwin))
|
||||||
|
Loading…
Reference in New Issue
Block a user