diff options
| author | Will Dietz <w@wdtz.org> | 2018-02-20 07:38:15 -0600 |
|---|---|---|
| committer | Will Dietz <w@wdtz.org> | 2018-02-20 08:01:21 -0600 |
| commit | e2ceb06642e1b1ac4e9d613267cd84a79509e2e1 (patch) | |
| tree | dfe958f94606dfbc04c7d7e742b61b10996369db /pkgs/games | |
| parent | 4327b9d9459bb0d4d4b67c14b1f85b678243e9bb (diff) | |
| download | nixlib-e2ceb06642e1b1ac4e9d613267cd84a79509e2e1.tar nixlib-e2ceb06642e1b1ac4e9d613267cd84a79509e2e1.tar.gz nixlib-e2ceb06642e1b1ac4e9d613267cd84a79509e2e1.tar.bz2 nixlib-e2ceb06642e1b1ac4e9d613267cd84a79509e2e1.tar.lz nixlib-e2ceb06642e1b1ac4e9d613267cd84a79509e2e1.tar.xz nixlib-e2ceb06642e1b1ac4e9d613267cd84a79509e2e1.tar.zst nixlib-e2ceb06642e1b1ac4e9d613267cd84a79509e2e1.zip | |
multimc: simplify a bit
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/multimc/default.nix | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/pkgs/games/multimc/default.nix b/pkgs/games/multimc/default.nix index 7d738e460091..b810420c64a3 100644 --- a/pkgs/games/multimc/default.nix +++ b/pkgs/games/multimc/default.nix @@ -1,32 +1,23 @@ { stdenv, fetchFromGitHub, cmake, jdk, zlib, file, makeWrapper, xorg, libpulseaudio, qtbase, quazip }: -stdenv.mkDerivation { - name = "multimc-0.6.1"; +let + libpath = with xorg; stdenv.lib.makeLibraryPath [ libX11 libXext libXcursor libXrandr libXxf86vm libpulseaudio ]; +in stdenv.mkDerivation rec { + name = "multimc-${version}"; + version = "0.6.1"; src = fetchFromGitHub { owner = "MultiMC"; repo = "MultiMC5"; - rev = "0.6.1"; + rev = version; sha256 = "0glsf4vfir8w24bpinf3cx2ninrcp7hpq9cl463wl78dvqfg47kx"; fetchSubmodules = true; }; buildInputs = [ cmake qtbase jdk zlib file makeWrapper ]; - libpath = with xorg; [ libX11 libXext libXcursor libXrandr libXxf86vm libpulseaudio ]; - enableParallelBuilding = true; - # the install rule tries to bundle ALL deps into the output for portability - installPhase = '' - RESULT=/run/opengl-driver/lib/ - for x in $libpath; do - RESULT=$x/lib/:$RESULT - done - - mkdir -pv $out/bin/jars $out/lib - cp -v MultiMC $out/bin/ - cp -v jars/*.jar $out/bin/jars/ #*/ - 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/ + postInstall = '' + wrapProgram $out/bin/MultiMC --add-flags "-d \$HOME/.multimc/" --set GAME_LIBRARY_PATH /run/opengl-driver/lib:${libpath} --prefix PATH : ${jdk}/bin/ ''; meta = with stdenv.lib; { |