diff options
| author | Arseniy Seroka <jagajaga@users.noreply.github.com> | 2016-06-11 22:35:19 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-11 22:35:19 +0300 |
| commit | 63dcc818e1b6cb21a4917fb17705f06b4878cd47 (patch) | |
| tree | cb1a0a07c709756e2f34da0d65a15ef6adb4874c /pkgs/games | |
| parent | 5347a118c25f20b49150150e59fe6168c0c8ff37 (diff) | |
| parent | 40b661a8500fc6b0f98e809db9259ca0f6191bd8 (diff) | |
| download | nixlib-63dcc818e1b6cb21a4917fb17705f06b4878cd47.tar nixlib-63dcc818e1b6cb21a4917fb17705f06b4878cd47.tar.gz nixlib-63dcc818e1b6cb21a4917fb17705f06b4878cd47.tar.bz2 nixlib-63dcc818e1b6cb21a4917fb17705f06b4878cd47.tar.lz nixlib-63dcc818e1b6cb21a4917fb17705f06b4878cd47.tar.xz nixlib-63dcc818e1b6cb21a4917fb17705f06b4878cd47.tar.zst nixlib-63dcc818e1b6cb21a4917fb17705f06b4878cd47.zip | |
Merge pull request #16091 from ryantm/minecraft
minecraft: use icon in jar
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/minecraft/default.nix | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix index f3a8a34fa3b8..6bceb40b523b 100644 --- a/pkgs/games/minecraft/default.nix +++ b/pkgs/games/minecraft/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, makeDesktopItem , jre, libX11, libXext, libXcursor, libXrandr, libXxf86vm +, openjdk , mesa, openal , useAlsa ? false, alsaOss ? null }: with stdenv.lib; @@ -7,15 +8,10 @@ with stdenv.lib; assert useAlsa -> alsaOss != null; let - icon = fetchurl { - url = "https://hydra-media.cursecdn.com/minecraft.gamepedia.com/c/c5/Grass.png"; - sha256 = "438c0f63e379e92af1b5b2e06cc5e3365ee272810af65ebc102304bce4fa8c4b"; - }; - desktopItem = makeDesktopItem { name = "minecraft"; exec = "minecraft"; - icon = "${icon}"; + icon = "minecraft"; comment = "A sandbox-building game"; desktopName = "Minecraft"; genericName = "minecraft"; @@ -49,6 +45,9 @@ in stdenv.mkDerivation { mkdir -p $out/share/applications ln -s ${desktopItem}/share/applications/* $out/share/applications/ + + ${openjdk}/bin/jar xf $out/minecraft.jar favicon.png + install -D favicon.png $out/share/icons/hicolor/32x32/apps/minecraft.png ''; meta = { |