mudlet: Fix build on darwin (#281657)

* mudlet: Fix build on darwin

* mudlet: refactor installPhase

* mudlet: use upstream patch

* mudlet: fix build on x86_64-darwin

---------

Co-authored-by: Weijia Wang <9713184+wegank@users.noreply.github.com>

authored by Felix Albrigtsen Weijia Wang and committed by GitHub 5e9d51ce fae8b9b9

+35 -9
+33 -9
pkgs/games/mudlet/default.nix
··· 1 1 { lib 2 2 , stdenv 3 3 , fetchFromGitHub 4 + , fetchpatch 4 5 , cmake 5 6 , git 6 7 , pkg-config ··· 20 21 , qtmultimedia 21 22 , discord-rpc 22 23 , yajl 24 + , AppKit 23 25 }: 24 26 25 27 let ··· 64 66 hash = "sha256-K75frptePKfHeGQNXaX4lKsLwO6Rs6AAka6hvP8MA+k="; 65 67 }; 66 68 69 + patches = [ 70 + (fetchpatch { 71 + name = "darwin-AppKit.patch"; 72 + url = "https://github.com/Mudlet/Mudlet/commit/68cdd404f81a6d16c80068c45fe0f10802f08d9e.patch"; 73 + hash = "sha256-74FtcjOR/lu9ohtcoup0+gUfCQRznO48zMmb97INhdY="; 74 + }) 75 + ]; 76 + 67 77 nativeBuildInputs = [ 68 78 cmake 69 79 git ··· 87 97 qtmultimedia 88 98 yajl 89 99 discord-rpc 100 + ] ++ lib.optional stdenv.isDarwin [ 101 + AppKit 90 102 ]; 91 103 92 104 cmakeFlags = [ ··· 101 113 runHook preInstall 102 114 103 115 mkdir -pv $out/lib 104 - cp 3rdparty/edbee-lib/edbee-lib/qslog/lib/libQsLog.so $out/lib 105 - mkdir -pv $out/bin 106 - cp src/mudlet $out 116 + cp 3rdparty/edbee-lib/edbee-lib/qslog/lib/libQsLog${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib 107 117 mkdir -pv $out/share/mudlet 108 118 cp -r ../src/mudlet-lua/lua $out/share/mudlet/ 109 119 110 - mkdir -pv $out/share/applications 111 - cp ../mudlet.desktop $out/share/applications/ 112 - 113 120 mkdir -pv $out/share/pixmaps 114 121 cp -r ../mudlet.png $out/share/pixmaps/ 115 122 116 123 cp -r ../translations $out/share/ 117 124 118 - makeQtWrapper $out/mudlet $out/bin/mudlet \ 125 + '' + lib.optionalString stdenv.isDarwin '' 126 + mkdir -p $out/Applications 127 + cp -r src/mudlet.app/ $out/Applications/mudlet.app 128 + mv $out/Applications/mudlet.app/Contents/MacOS/mudlet $out/Applications/mudlet.app/Contents/MacOS/mudlet-unwrapped 129 + makeQtWrapper $out/Applications/Mudlet.app/Contents/MacOS/mudlet-unwrapped $out/Applications/Mudlet.app/Contents/MacOS/mudlet \ 130 + --set LUA_CPATH "${luaEnv}/lib/lua/${lua.luaversion}/?.so" \ 131 + --prefix LUA_PATH : "$NIX_LUA_PATH" \ 132 + --prefix DYLD_LIBRARY_PATH : "${lib.makeLibraryPath [ libsForQt5.qtkeychain discord-rpc ]}:$out/lib" \ 133 + --chdir "$out"; 134 + 135 + '' + lib.optionalString (!stdenv.isDarwin) '' 136 + mkdir -pv $out/bin 137 + cp src/mudlet $out/bin/mudlet-unwrapped 138 + makeQtWrapper $out/bin/mudlet-unwrapped $out/bin/mudlet \ 119 139 --set LUA_CPATH "${luaEnv}/lib/lua/${lua.luaversion}/?.so" \ 120 140 --prefix LUA_PATH : "$NIX_LUA_PATH" \ 121 141 --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libsForQt5.qtkeychain discord-rpc ]}" \ 122 142 --chdir "$out"; 123 143 144 + mkdir -pv $out/share/applications 145 + cp ../mudlet.desktop $out/share/applications/ 146 + 147 + '' + '' 124 148 runHook postInstall 125 149 ''; 126 150 127 151 meta = with lib; { 128 152 description = "Crossplatform mud client"; 129 153 homepage = "https://www.mudlet.org/"; 130 - maintainers = with maintainers; [ wyvie pstn cpu ]; 131 - platforms = platforms.linux; 154 + maintainers = with maintainers; [ wyvie pstn cpu felixalbrigtsen ]; 155 + platforms = platforms.linux ++ platforms.darwin; 132 156 license = licenses.gpl2Plus; 133 157 mainProgram = "mudlet"; 134 158 };
+2
pkgs/top-level/all-packages.nix
··· 37950 37950 37951 37951 mudlet = libsForQt5.callPackage ../games/mudlet { 37952 37952 lua = lua5_1; 37953 + stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; 37954 + inherit (darwin.apple_sdk_11_0.frameworks) AppKit; 37953 37955 }; 37954 37956 37955 37957 blightmud = callPackage ../games/blightmud { };