diff options
author | Mx Kookie <kookie@spacekookie.de> | 2020-12-09 18:55:19 +0000 |
---|---|---|
committer | Mx Kookie <kookie@spacekookie.de> | 2020-12-09 18:55:19 +0000 |
commit | 80d90d9b204f7c17912740f9f414fe5d59f293ba (patch) | |
tree | 5f2065a06e724270610760d59d01c6888b375a46 /infra/libkookie/nixpkgs/pkgs/games/minecraft/default.nix | |
parent | 3a31a84c7d3e589035ad08499206aac44a81f424 (diff) | |
parent | 83cbad92d73216bb0d9187c56cce0b91f9121d5a (diff) |
Merge commit '83cbad92d73216bb0d9187c56cce0b91f9121d5a' into main
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/games/minecraft/default.nix')
-rw-r--r-- | infra/libkookie/nixpkgs/pkgs/games/minecraft/default.nix | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/games/minecraft/default.nix b/infra/libkookie/nixpkgs/pkgs/games/minecraft/default.nix index 9bdf979d7dd4..03abcb151bc1 100644 --- a/infra/libkookie/nixpkgs/pkgs/games/minecraft/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/games/minecraft/default.nix @@ -1,5 +1,7 @@ { stdenv , fetchurl +, nixosTests +, copyDesktopItems , makeDesktopItem , makeWrapper , wrapGAppsHook @@ -10,7 +12,7 @@ , nss , nspr , fontconfig -, gnome2 +, pango , cairo , expat , alsaLib @@ -59,7 +61,7 @@ let freetype gdk-pixbuf glib - gnome2.pango + pango gtk3-x11 gtk2-x11 nspr @@ -86,11 +88,11 @@ in stdenv.mkDerivation rec { pname = "minecraft-launcher"; - version = "2.1.17627"; + version = "2.2.741"; src = fetchurl { url = "https://launcher.mojang.com/download/linux/x86_64/minecraft-launcher_${version}.tar.gz"; - sha256 = "04zjjyy0psfxfibzbac9w0kkgqwfpf1qmbj5gspyvhaib7k8may0"; + sha256 = "0bm78ybn91ihibxgmlpk7dl2zxy4a57k86qmb08cif3ifbflzkvw"; }; icon = fetchurl { @@ -98,7 +100,7 @@ stdenv.mkDerivation rec { sha256 = "0w8z21ml79kblv20wh5lz037g130pxkgs8ll9s3bi94zn2pbrhim"; }; - nativeBuildInputs = [ makeWrapper wrapGAppsHook ]; + nativeBuildInputs = [ makeWrapper wrapGAppsHook copyDesktopItems ]; buildInputs = [ gobject-introspection ]; sourceRoot = "."; @@ -108,11 +110,14 @@ stdenv.mkDerivation rec { dontBuild = true; installPhase = '' + runHook preInstall + mkdir -p $out/opt mv minecraft-launcher $out/opt - ${desktopItem.buildCommand} install -D $icon $out/share/icons/hicolor/symbolic/apps/minecraft-launcher.svg + + runHook postInstall ''; preFixup = '' @@ -138,6 +143,8 @@ stdenv.mkDerivation rec { "''${gappsWrapperArgs[@]}" ''; + desktopItems = [ desktopItem ]; + meta = with stdenv.lib; { description = "Official launcher for Minecraft, a sandbox-building game"; homepage = "https://minecraft.net"; @@ -146,5 +153,8 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" ]; }; - passthru.updateScript = ./update.sh; + passthru = { + tests = { inherit (nixosTests) minecraft; }; + updateScript = ./update.sh; + }; } |