Merge pull request #82156 from rnhmjoj/minecraft
minecraft: install missing gsettings schemas
This commit is contained in:
commit
bc98978d04
1 changed files with 14 additions and 6 deletions
|
@ -2,6 +2,8 @@
|
||||||
, fetchurl
|
, fetchurl
|
||||||
, makeDesktopItem
|
, makeDesktopItem
|
||||||
, makeWrapper
|
, makeWrapper
|
||||||
|
, wrapGAppsHook
|
||||||
|
, gobject-introspection
|
||||||
, jre # old or modded versions of the game may require Java 8 (https://aur.archlinux.org/packages/minecraft-launcher/#pinned-674960)
|
, jre # old or modded versions of the game may require Java 8 (https://aur.archlinux.org/packages/minecraft-launcher/#pinned-674960)
|
||||||
, xorg
|
, xorg
|
||||||
, zlib
|
, zlib
|
||||||
|
@ -96,10 +98,12 @@ in
|
||||||
sha256 = "0w8z21ml79kblv20wh5lz037g130pxkgs8ll9s3bi94zn2pbrhim";
|
sha256 = "0w8z21ml79kblv20wh5lz037g130pxkgs8ll9s3bi94zn2pbrhim";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ makeWrapper ];
|
nativeBuildInputs = [ makeWrapper wrapGAppsHook ];
|
||||||
|
buildInputs = [ gobject-introspection ];
|
||||||
|
|
||||||
sourceRoot = ".";
|
sourceRoot = ".";
|
||||||
|
|
||||||
|
dontWrapGApps = true;
|
||||||
dontConfigure = true;
|
dontConfigure = true;
|
||||||
dontBuild = true;
|
dontBuild = true;
|
||||||
|
|
||||||
|
@ -109,11 +113,6 @@ in
|
||||||
|
|
||||||
${desktopItem.buildCommand}
|
${desktopItem.buildCommand}
|
||||||
install -D $icon $out/share/icons/hicolor/symbolic/apps/minecraft-launcher.svg
|
install -D $icon $out/share/icons/hicolor/symbolic/apps/minecraft-launcher.svg
|
||||||
|
|
||||||
makeWrapper $out/opt/minecraft-launcher/minecraft-launcher $out/bin/minecraft-launcher \
|
|
||||||
--prefix LD_LIBRARY_PATH : ${envLibPath} \
|
|
||||||
--prefix PATH : ${stdenv.lib.makeBinPath [ jre ]} \
|
|
||||||
--run "cd /tmp" # Do not create `GPUCache` in current directory
|
|
||||||
'';
|
'';
|
||||||
|
|
||||||
preFixup = ''
|
preFixup = ''
|
||||||
|
@ -129,6 +128,15 @@ in
|
||||||
$out/opt/minecraft-launcher/liblauncher.so
|
$out/opt/minecraft-launcher/liblauncher.so
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
postFixup = ''
|
||||||
|
# Do not create `GPUCache` in current directory
|
||||||
|
makeWrapper $out/opt/minecraft-launcher/minecraft-launcher $out/bin/minecraft-launcher \
|
||||||
|
--prefix LD_LIBRARY_PATH : ${envLibPath} \
|
||||||
|
--prefix PATH : ${stdenv.lib.makeBinPath [ jre ]} \
|
||||||
|
--run "cd /tmp" \
|
||||||
|
"''${gappsWrapperArgs[@]}"
|
||||||
|
'';
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
description = "Official launcher for Minecraft, a sandbox-building game";
|
description = "Official launcher for Minecraft, a sandbox-building game";
|
||||||
homepage = "https://minecraft.net";
|
homepage = "https://minecraft.net";
|
||||||
|
|
Loading…
Reference in a new issue