Merge pull request #238476 from OPNA2608/update/mmlgui

mmlgui: unstable-2023-03-19 -> unstable-2023-06-12, fix cross

authored by Sandro and committed by GitHub fe6ae4d5 ed5d9112

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