diff options
author | Will Dietz <w@wdtz.org> | 2018-02-20 07:29:56 -0600 |
---|---|---|
committer | Will Dietz <w@wdtz.org> | 2018-02-20 08:01:21 -0600 |
commit | 4327b9d9459bb0d4d4b67c14b1f85b678243e9bb (patch) | |
tree | d6fc5824268465d2430c1e439951b623a369f9ad /pkgs/games/multimc | |
parent | 9095f02876bfcfcc32003a908703604f1414e174 (diff) |
multimc: 0.5.1 -> 0.6.1
Fetch dependencies as git submodules: * Replaces need to manually track + fetch libnbtplusplus source * upstream relies on a forked version of quazip so we can't use ours Fixes #35189.
Diffstat (limited to 'pkgs/games/multimc')
-rw-r--r-- | pkgs/games/multimc/default.nix | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/pkgs/games/multimc/default.nix b/pkgs/games/multimc/default.nix index e438008b19c26..7d738e4600911 100644 --- a/pkgs/games/multimc/default.nix +++ b/pkgs/games/multimc/default.nix @@ -1,31 +1,17 @@ { stdenv, fetchFromGitHub, cmake, jdk, zlib, file, makeWrapper, xorg, libpulseaudio, qtbase, quazip }: -let - libnbt = fetchFromGitHub { - owner = "MultiMC"; - repo = "libnbtplusplus"; - rev = "4b305bb"; - sha256 = "1zj7pxk0g5zl16hrngb4rss00hi019rylin7zgf18kaymc54nbcs"; - }; -in stdenv.mkDerivation { - name = "multimc-0.5.1"; + name = "multimc-0.6.1"; src = fetchFromGitHub { owner = "MultiMC"; repo = "MultiMC5"; - rev = "0.5.1"; - sha256 = "0wmlnwcq3gxrbmc53j96aa64pp1kmnlxiifhzngcb5kfmbbc8a20"; + rev = "0.6.1"; + sha256 = "0glsf4vfir8w24bpinf3cx2ninrcp7hpq9cl463wl78dvqfg47kx"; + fetchSubmodules = true; }; buildInputs = [ cmake qtbase jdk zlib file makeWrapper ]; libpath = with xorg; [ libX11 libXext libXcursor libXrandr libXxf86vm libpulseaudio ]; - postUnpack = '' - 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 - ''; enableParallelBuilding = true; |