pyrox.dev
Merge pull request #238476 from OPNA2608/update/mmlgui
mmlgui: unstable-2023-03-19 -> unstable-2023-06-12, fix cross
+13
-5
pkgs/applications/audio/mmlgui/default.nix
+13
-5
pkgs/applications/audio/mmlgui/default.nix
···
15
16
stdenv.mkDerivation rec {
17
pname = "mmlgui";
18
-
version = "unstable-2023-03-19";
19
20
src = fetchFromGitHub {
21
owner = "superctr";
22
repo = "mmlgui";
23
-
rev = "59ac28c0008e227c03799cce85b77f96241159b1";
24
fetchSubmodules = true;
25
-
sha256 = "0CHRUizhg/WOWhDOsFqRiGu/m/U7xt5du8Uvnl7kxpU=";
26
};
27
28
postPatch = ''
···
31
# Removing a pkgconf-specific option makes it work with pkg-config
32
substituteInPlace libvgm.mak \
33
--replace '--with-path=/usr/local/lib/pkgconfig' ""
34
substituteInPlace Makefile \
35
--replace 'all: $(MMLGUI_BIN) test' 'all: $(MMLGUI_BIN)'
36
'';
37
38
nativeBuildInputs = [
39
pkg-config
···
51
Cocoa
52
];
53
54
-
nativeCheckInputs = [
55
cppunit
56
];
57
···
61
62
enableParallelBuilding = true;
63
64
-
doCheck = true;
65
66
installPhase = ''
67
runHook preInstall
···
15
16
stdenv.mkDerivation rec {
17
pname = "mmlgui";
18
+
version = "unstable-2023-06-12";
19
20
src = fetchFromGitHub {
21
owner = "superctr";
22
repo = "mmlgui";
23
+
rev = "d680f576aba769b0d63300fbed57a0e9e54dfa4b";
24
fetchSubmodules = true;
25
+
hash = "sha256-BqwayGQBIa0ru22Xci8vHNYPFr9scZSdrUOlDtGBnno=";
26
};
27
28
postPatch = ''
···
31
# Removing a pkgconf-specific option makes it work with pkg-config
32
substituteInPlace libvgm.mak \
33
--replace '--with-path=/usr/local/lib/pkgconfig' ""
34
+
35
+
# Use correct pkg-config
36
+
substituteInPlace {imgui,libvgm}.mak \
37
+
--replace 'pkg-config' "\''$(PKG_CONFIG)"
38
+
39
+
# Don't force building tests
40
substituteInPlace Makefile \
41
--replace 'all: $(MMLGUI_BIN) test' 'all: $(MMLGUI_BIN)'
42
'';
43
+
44
+
strictDeps = true;
45
46
nativeBuildInputs = [
47
pkg-config
···
59
Cocoa
60
];
61
62
+
checkInputs = [
63
cppunit
64
];
65
···
69
70
enableParallelBuilding = true;
71
72
+
doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
73
74
installPhase = ''
75
runHook preInstall