gepetto-viewer: 5.1.0 -> 5.2.0, gepetto-viewer-corba: 5.8.0 -> 5.8.1 (#347765)

This commit is contained in:
Weijia Wang
2024-11-03 03:00:52 +01:00
committed by GitHub
2 changed files with 4 additions and 25 deletions
@@ -14,14 +14,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gepetto-viewer-corba";
version = "5.8.0";
pyproject = false; # CMake
version = "5.8.1";
src = fetchFromGitHub {
owner = "gepetto";
repo = "gepetto-viewer-corba";
rev = "v${finalAttrs.version}";
hash = "sha256-/bpAs4ca/+QjWEGuHhuDT8Ts2Ggg+DZWETZfjho6E0w=";
hash = "sha256-C7xrODoKCcyLPZr0+zZSZ/o5i5EeNsxCPXp2WrP28A4=";
};
outputs = [
@@ -29,12 +28,6 @@ stdenv.mkDerivation (finalAttrs: {
"doc"
];
postPatch = ''
substituteInPlace src/CMakeLists.txt \
--replace-fail "ARGUMENTS $" "ARGUMENTS -p${python3Packages.omniorbpy}/${python3Packages.python.sitePackages} $" \
--replace-fail '$'{CMAKE_SOURCE_DIR}/cmake '$'{JRL_CMAKE_MODULES}
'';
buildInputs = [ libsForQt5.qtbase ];
nativeBuildInputs = [
+2 -16
View File
@@ -4,7 +4,6 @@
darwin,
doxygen,
fetchFromGitHub,
fetchpatch,
fontconfig,
lib,
jrl-cmakemodules,
@@ -21,28 +20,15 @@
let
gepetto-viewer = stdenv.mkDerivation (finalAttrs: {
pname = "gepetto-viewer";
version = "5.1.0";
version = "5.2.0";
src = fetchFromGitHub {
owner = "gepetto";
repo = "gepetto-viewer";
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 = [
(lib.cmakeBool "BUILD_PY_QCUSTOM_PLOT" (!stdenv.hostPlatform.isDarwin))
(lib.cmakeBool "BUILD_PY_QGV" (!stdenv.hostPlatform.isDarwin))