pyrox.dev / nixpkgs
lol
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

multimc: 5 -> 0.5.1

michael bishop 3690ad17 880e65e1

+9 -35
+9 -11
pkgs/games/multimc/default.nix
··· 4 4 libnbt = fetchFromGitHub { 5 5 owner = "MultiMC"; 6 6 repo = "libnbtplusplus"; 7 - rev = "5d0ffb50a526173ce58ae57136bf5d79a7e1920d"; 8 - sha256 = "05hnwfb77rmm9ba7n96g4g1sgwqqcmplvbcafsl76yxr6ysgw5jg"; 7 + rev = "4b305bb"; 8 + sha256 = "1zj7pxk0g5zl16hrngb4rss00hi019rylin7zgf18kaymc54nbcs"; 9 9 }; 10 10 in 11 11 stdenv.mkDerivation { 12 - name = "multimc-5"; 12 + name = "multimc-0.5.1"; 13 13 src = fetchFromGitHub { 14 14 owner = "MultiMC"; 15 15 repo = "MultiMC5"; 16 - rev = "895d8ab4699f1b50bf03532c967a91f5ecb62a50"; 17 - sha256 = "179vc1iv57fx4g4h1wy8yvyvdm671jnvp6zi8pcr1n6azqhwklds"; 16 + rev = "0.5.1"; 17 + sha256 = "0wmlnwcq3gxrbmc53j96aa64pp1kmnlxiifhzngcb5kfmbbc8a20"; 18 18 }; 19 19 buildInputs = [ cmake qtbase jdk zlib file makeWrapper ]; 20 20 21 21 libpath = with xorg; [ libX11 libXext libXcursor libXrandr libXxf86vm libpulseaudio ]; 22 22 postUnpack = '' 23 - rmdir $sourceRoot/depends/libnbtplusplus 24 - cp -r ${libnbt} $sourceRoot/depends/libnbtplusplus 25 - chmod 755 -R $sourceRoot/depends/libnbtplusplus 23 + rmdir $sourceRoot/libraries/libnbtplusplus 24 + cp -r ${libnbt} $sourceRoot/libraries/libnbtplusplus 25 + chmod 755 -R $sourceRoot/libraries/libnbtplusplus 26 26 mkdir -pv $sourceRoot/build/ 27 27 cp -v ${quazip.src} $sourceRoot/build/quazip-0.7.1.tar.gz 28 28 ''; 29 - 30 - patches = [ ./multimc.patch ]; 31 29 32 30 enableParallelBuilding = true; 33 31 ··· 41 39 mkdir -pv $out/bin/jars $out/lib 42 40 cp -v MultiMC $out/bin/ 43 41 cp -v jars/*.jar $out/bin/jars/ #*/ 44 - cp -v librainbow.so libnbt++.so libMultiMC_logic.so $out/lib 42 + cp -v libMultiMC_rainbow.so libMultiMC_nbt++.so libMultiMC_logic.so libMultiMC_gui.so $out/lib 45 43 wrapProgram $out/bin/MultiMC --add-flags "-d \$HOME/.multimc/" --set GAME_LIBRARY_PATH $RESULT --prefix PATH : ${jdk}/bin/ 46 44 ''; 47 45
-24
pkgs/games/multimc/multimc.patch
··· 1 - diff -ur MultiMC5-895d8ab4699f1b50bf03532c967a91f5ecb62a50-src-orig/application/MultiMC.cpp MultiMC5-895d8ab4699f1b50bf03532c967a91f5ecb62a50-src/application/MultiMC.cpp 2 - --- MultiMC5-895d8ab4699f1b50bf03532c967a91f5ecb62a50-src-orig/application/MultiMC.cpp 2015-10-25 03:29:25.270126028 -0300 3 - +++ MultiMC5-895d8ab4699f1b50bf03532c967a91f5ecb62a50-src/application/MultiMC.cpp 2015-10-25 04:22:48.568437861 -0300 4 - @@ -330,7 +330,7 @@ 5 - } 6 - 7 - m_mmc_translator.reset(new QTranslator()); 8 - - if (m_mmc_translator->load("mmc_" + locale.bcp47Name(), staticDataPath + "/translations")) 9 - + if (m_mmc_translator->load("mmc_" + locale.bcp47Name(), "translations")) 10 - { 11 - qDebug() << "Loading MMC Language File for" 12 - << locale.bcp47Name().toLocal8Bit().constData() << "..."; 13 - diff -ur MultiMC5-895d8ab4699f1b50bf03532c967a91f5ecb62a50-src-orig/logic/Env.cpp MultiMC5-895d8ab4699f1b50bf03532c967a91f5ecb62a50-src/logic/Env.cpp 14 - --- MultiMC5-895d8ab4699f1b50bf03532c967a91f5ecb62a50-src-orig/logic/Env.cpp 2015-10-25 03:29:25.428124792 -0300 15 - +++ MultiMC5-895d8ab4699f1b50bf03532c967a91f5ecb62a50-src/logic/Env.cpp 2015-10-25 04:29:24.145412196 -0300 16 - @@ -147,7 +147,7 @@ 17 - m_metacache->addBase("general", QDir("cache").absolutePath()); 18 - m_metacache->addBase("skins", QDir("accounts/skins").absolutePath()); 19 - m_metacache->addBase("root", QDir(rootPath).absolutePath()); 20 - - m_metacache->addBase("translations", QDir(staticDataPath + "/translations").absolutePath()); 21 - + m_metacache->addBase("translations", QDir("translations").absolutePath()); 22 - m_metacache->addBase("icons", QDir("cache/icons").absolutePath()); 23 - m_metacache->Load(); 24 - }