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

authored by

Weijia Wang and committed by
GitHub
3ce0ea52 80ec877a

+4 -25
+2 -9
pkgs/by-name/ge/gepetto-viewer-corba/package.nix
··· 14 14 15 15 stdenv.mkDerivation (finalAttrs: { 16 16 pname = "gepetto-viewer-corba"; 17 - version = "5.8.0"; 18 - pyproject = false; # CMake 17 + version = "5.8.1"; 19 18 20 19 src = fetchFromGitHub { 21 20 owner = "gepetto"; 22 21 repo = "gepetto-viewer-corba"; 23 22 rev = "v${finalAttrs.version}"; 24 - hash = "sha256-/bpAs4ca/+QjWEGuHhuDT8Ts2Ggg+DZWETZfjho6E0w="; 23 + hash = "sha256-C7xrODoKCcyLPZr0+zZSZ/o5i5EeNsxCPXp2WrP28A4="; 25 24 }; 26 25 27 26 outputs = [ 28 27 "out" 29 28 "doc" 30 29 ]; 31 - 32 - postPatch = '' 33 - substituteInPlace src/CMakeLists.txt \ 34 - --replace-fail "ARGUMENTS $" "ARGUMENTS -p${python3Packages.omniorbpy}/${python3Packages.python.sitePackages} $" \ 35 - --replace-fail '$'{CMAKE_SOURCE_DIR}/cmake '$'{JRL_CMAKE_MODULES} 36 - ''; 37 30 38 31 buildInputs = [ libsForQt5.qtbase ]; 39 32
+2 -16
pkgs/by-name/ge/gepetto-viewer/package.nix
··· 4 4 darwin, 5 5 doxygen, 6 6 fetchFromGitHub, 7 - fetchpatch, 8 7 fontconfig, 9 8 lib, 10 9 jrl-cmakemodules, ··· 21 20 let 22 21 gepetto-viewer = stdenv.mkDerivation (finalAttrs: { 23 22 pname = "gepetto-viewer"; 24 - version = "5.1.0"; 23 + version = "5.2.0"; 25 24 26 25 src = fetchFromGitHub { 27 26 owner = "gepetto"; 28 27 repo = "gepetto-viewer"; 29 28 rev = "v${finalAttrs.version}"; 30 - hash = "sha256-A2J3HidG+OHJO8LpLiOEvORxDtViTdeVD85AmKkkOg8="; 29 + hash = "sha256-kAQPi7bO48H0CZKz1bxfkvMiNy8RsXvRvpDK0KF7XLM="; 31 30 }; 32 - 33 - patches = [ 34 - # fix use of CMAKE_INSTALL_BINDIR for $bin output 35 - (fetchpatch { 36 - url = "https://github.com/Gepetto/gepetto-viewer/pull/230/commits/9b1b3a61da016934c3e766e6b491c1d6f3fc80d6.patch"; 37 - hash = "sha256-dpviEkOyCZpTYntZ4sCG1AvobljJphPQxg7gA6JxfWs="; 38 - }) 39 - # fix use of CMAKE_INSTALL_FULL_INCLUDEDIR for $dev output 40 - (fetchpatch { 41 - url = "https://github.com/Gepetto/gepetto-viewer/pull/230/commits/4e1c2bbe063db20b605e51495e9f9eca40138cca.patch"; 42 - hash = "sha256-HrecvW1ulCSt9+DUaQVBOoDkilGRqU2+GUx7NUw7hqc="; 43 - }) 44 - ]; 45 31 46 32 cmakeFlags = [ 47 33 (lib.cmakeBool "BUILD_PY_QCUSTOM_PLOT" (!stdenv.hostPlatform.isDarwin))