mmlgui: unstable-2023-03-19 -> unstable-2023-06-12, fix cross
This commit is contained in:
parent
4a9e97d808
commit
f68295e52e
1 changed files with 13 additions and 5 deletions
|
@ -15,14 +15,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mmlgui";
|
||||
version = "unstable-2023-03-19";
|
||||
version = "unstable-2023-06-12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "superctr";
|
||||
repo = "mmlgui";
|
||||
rev = "59ac28c0008e227c03799cce85b77f96241159b1";
|
||||
rev = "d680f576aba769b0d63300fbed57a0e9e54dfa4b";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "0CHRUizhg/WOWhDOsFqRiGu/m/U7xt5du8Uvnl7kxpU=";
|
||||
hash = "sha256-BqwayGQBIa0ru22Xci8vHNYPFr9scZSdrUOlDtGBnno=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -31,10 +31,18 @@ stdenv.mkDerivation rec {
|
|||
# Removing a pkgconf-specific option makes it work with pkg-config
|
||||
substituteInPlace libvgm.mak \
|
||||
--replace '--with-path=/usr/local/lib/pkgconfig' ""
|
||||
|
||||
# Use correct pkg-config
|
||||
substituteInPlace {imgui,libvgm}.mak \
|
||||
--replace 'pkg-config' "\''$(PKG_CONFIG)"
|
||||
|
||||
# Don't force building tests
|
||||
substituteInPlace Makefile \
|
||||
--replace 'all: $(MMLGUI_BIN) test' 'all: $(MMLGUI_BIN)'
|
||||
'';
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
|
@ -51,7 +59,7 @@ stdenv.mkDerivation rec {
|
|||
Cocoa
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
checkInputs = [
|
||||
cppunit
|
||||
];
|
||||
|
||||
|
@ -61,7 +69,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
doCheck = true;
|
||||
doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
|
Loading…
Reference in a new issue