Skip to content

Commit

Permalink
makehuman: 1.2.0 -> 1.3.0 (NixOS#349997)
Browse files Browse the repository at this point in the history
  • Loading branch information
JohnRTitor authored Oct 24, 2024
2 parents 14dc2c8 + f00ef5e commit c912fc0
Showing 1 changed file with 2 additions and 35 deletions.
37 changes: 2 additions & 35 deletions pkgs/applications/misc/makehuman/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ let
in
stdenv.mkDerivation rec {
pname = "makehuman";
version = "1.2.0";
version = "1.3.0";

source = fetchFromGitHub {
owner = "makehumancommunity";
repo = "makehuman";
rev = "v${version}";
hash = "sha256-mCv6H0B7b4uxozpNHkKsG+Is2H0QYEJnnzKCHixhBpY=";
hash = "sha256-x0v/SkwtOl1lkVi2TRuIgx2Xgz4JcWD3He7NhU44Js4=";
name = "${pname}-source";
};

Expand All @@ -36,39 +36,6 @@ stdenv.mkDerivation rec {
name = "${pname}-assets-source";
};

patches = [
# work with numpy>=1.24
(fetchpatch {
name = "fix-compile_targets.py-when-using-numpy-1.24.0-or-newer";
url = "https://patch-diff.githubusercontent.com/raw/makehumancommunity/makehuman/pull/220.patch";
hash = "sha256-ip7U83cCBrl+4gM1GZ2QQIER5Qur6HRu3a/TnHqk//g=";
})
# crash related to collections.Callable -> collections.abc.Callable
(fetchpatch {
name = "remove-unnecessary-compatibility-test";
url = "https://patch-diff.githubusercontent.com/raw/makehumancommunity/makehuman/pull/188.patch";
hash = "sha256-HGrk3n7rhV4YgK8mNUdfHwQl8dFT8yuzjxorvwfMmJw=";
})
# some OpenGL issue causing blank windows on recent Qt
(fetchpatch {
name = "qt-opengl-update-from-qglwidget-to-qopenglwidget-to-fix-blank";
url = "https://patch-diff.githubusercontent.com/raw/makehumancommunity/makehuman/pull/197.patch";
hash = "sha256-fEqBwg1Jd36nKWIT9XPr6Buj1N3AmTQg2LBaoX3eTxw=";
})
# multisampling issue
(fetchpatch {
name = "switch-default-for-multisampling-and-disable-sample-buffers";
url = "https://github.com/makehumancommunity/makehuman/commit/c47b884028a24eb190d097e7523a3059e439cb6f.patch";
hash = "sha256-tknQHX9qQYH15gyOLNhxfO3bsFVIv3Z1F7ZXD1IT1h4=";
})
# PyQt >= 5.12
(fetchpatch {
name = "fix-scrolling-issue-on-pyqt5>=5.12";
url = "https://github.com/makehumancommunity/makehuman/commit/02c4269a2d4c57f68159fe8f437a8b1978b99099.patch";
hash = "sha256-yR5tZcELX0N83PW/vS6yB5xKoZcHhVp48invlu7quWM=";
})
];

srcs = [
source
assets
Expand Down

0 comments on commit c912fc0

Please sign in to comment.