ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-18 13:19:10 +03:00
Code Issues Projects Releases Wiki Activity

multimc: 5 -> 0.5.1

Browse Source
This commit is contained in:
michael bishop 2017-03-31 18:36:18 -03:00
parent 880e65e162
commit 3690ad1772
No known key found for this signature in database
GPG Key ID: C294FC1A485A409A
2 changed files with 9 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/games/multimc/default.nix
View File

@ -4,31 +4,29 @@ let
libnbt = fetchFromGitHub {
owner = "MultiMC";
repo = "libnbtplusplus";
rev = "5d0ffb50a526173ce58ae57136bf5d79a7e1920d";
sha256 = "05hnwfb77rmm9ba7n96g4g1sgwqqcmplvbcafsl76yxr6ysgw5jg";
rev = "4b305bb";
sha256 = "1zj7pxk0g5zl16hrngb4rss00hi019rylin7zgf18kaymc54nbcs";
};
in
stdenv.mkDerivation {
name = "multimc-5";
name = "multimc-0.5.1";
src = fetchFromGitHub {
owner = "MultiMC";
repo = "MultiMC5";
rev = "895d8ab4699f1b50bf03532c967a91f5ecb62a50";
sha256 = "179vc1iv57fx4g4h1wy8yvyvdm671jnvp6zi8pcr1n6azqhwklds";
rev = "0.5.1";
sha256 = "0wmlnwcq3gxrbmc53j96aa64pp1kmnlxiifhzngcb5kfmbbc8a20";
};
buildInputs = [ cmake qtbase jdk zlib file makeWrapper ];
libpath = with xorg; [ libX11 libXext libXcursor libXrandr libXxf86vm libpulseaudio ];
postUnpack = ''
rmdir $sourceRoot/depends/libnbtplusplus
cp -r ${libnbt} $sourceRoot/depends/libnbtplusplus
chmod 755 -R $sourceRoot/depends/libnbtplusplus
rmdir $sourceRoot/libraries/libnbtplusplus
cp -r ${libnbt} $sourceRoot/libraries/libnbtplusplus
chmod 755 -R $sourceRoot/libraries/libnbtplusplus
mkdir -pv $sourceRoot/build/
cp -v ${quazip.src} $sourceRoot/build/quazip-0.7.1.tar.gz
'';
patches = [ ./multimc.patch ];
enableParallelBuilding = true;
# the install rule tries to bundle ALL deps into the output for portability
@ -41,7 +39,7 @@ stdenv.mkDerivation {
mkdir -pv $out/bin/jars $out/lib
cp -v MultiMC $out/bin/
cp -v jars/*.jar $out/bin/jars/ #*/
cp -v librainbow.so libnbt++.so libMultiMC_logic.so $out/lib
cp -v libMultiMC_rainbow.so libMultiMC_nbt++.so libMultiMC_logic.so libMultiMC_gui.so $out/lib
wrapProgram $out/bin/MultiMC --add-flags "-d \$HOME/.multimc/" --set GAME_LIBRARY_PATH $RESULT --prefix PATH : ${jdk}/bin/
'';

24
pkgs/games/multimc/multimc.patch
View File

@ -1,24 +0,0 @@
diff -ur MultiMC5-895d8ab4699f1b50bf03532c967a91f5ecb62a50-src-orig/application/MultiMC.cpp MultiMC5-895d8ab4699f1b50bf03532c967a91f5ecb62a50-src/application/MultiMC.cpp
--- MultiMC5-895d8ab4699f1b50bf03532c967a91f5ecb62a50-src-orig/application/MultiMC.cpp 2015-10-25 03:29:25.270126028 -0300
+++ MultiMC5-895d8ab4699f1b50bf03532c967a91f5ecb62a50-src/application/MultiMC.cpp 2015-10-25 04:22:48.568437861 -0300
@@ -330,7 +330,7 @@
}
m_mmc_translator.reset(new QTranslator());
- if (m_mmc_translator->load("mmc_" + locale.bcp47Name(), staticDataPath + "/translations"))
+ if (m_mmc_translator->load("mmc_" + locale.bcp47Name(), "translations"))
{
qDebug() << "Loading MMC Language File for"
<< locale.bcp47Name().toLocal8Bit().constData() << "...";
diff -ur MultiMC5-895d8ab4699f1b50bf03532c967a91f5ecb62a50-src-orig/logic/Env.cpp MultiMC5-895d8ab4699f1b50bf03532c967a91f5ecb62a50-src/logic/Env.cpp
--- MultiMC5-895d8ab4699f1b50bf03532c967a91f5ecb62a50-src-orig/logic/Env.cpp 2015-10-25 03:29:25.428124792 -0300
+++ MultiMC5-895d8ab4699f1b50bf03532c967a91f5ecb62a50-src/logic/Env.cpp 2015-10-25 04:29:24.145412196 -0300
@@ -147,7 +147,7 @@
m_metacache->addBase("general", QDir("cache").absolutePath());
m_metacache->addBase("skins", QDir("accounts/skins").absolutePath());
m_metacache->addBase("root", QDir(rootPath).absolutePath());
- m_metacache->addBase("translations", QDir(staticDataPath + "/translations").absolutePath());
+ m_metacache->addBase("translations", QDir("translations").absolutePath());
m_metacache->addBase("icons", QDir("cache/icons").absolutePath());
m_metacache->Load();
}