summary refs log tree commit diff
path: root/pkgs/games/minecraft
diff options
context:
space:
mode:
authorRyan Mulligan <ryan@ryantm.com>2016-06-09 07:02:26 -0700
committerRyan Mulligan <ryan@ryantm.com>2016-06-10 07:16:36 -0700
commit40b661a8500fc6b0f98e809db9259ca0f6191bd8 (patch)
tree1436981058e7a14d85cd09fe2c65df3d20a50715 /pkgs/games/minecraft
parent20c2ce4954d4ef67dc77cd773ee95e6d36784d01 (diff)
downloadnixpkgs-40b661a8500fc6b0f98e809db9259ca0f6191bd8.tar
nixpkgs-40b661a8500fc6b0f98e809db9259ca0f6191bd8.tar.gz
nixpkgs-40b661a8500fc6b0f98e809db9259ca0f6191bd8.tar.bz2
nixpkgs-40b661a8500fc6b0f98e809db9259ca0f6191bd8.tar.lz
nixpkgs-40b661a8500fc6b0f98e809db9259ca0f6191bd8.tar.xz
nixpkgs-40b661a8500fc6b0f98e809db9259ca0f6191bd8.tar.zst
nixpkgs-40b661a8500fc6b0f98e809db9259ca0f6191bd8.zip
minecraft: use icon in jar
This removes the dependency on a wiki image download, which seemed bad
when I first introduced it. Unfortunately, they do not provide a 48x48
icon so we are not satisfying the minimal XDG standard.
Diffstat (limited to 'pkgs/games/minecraft')
-rw-r--r--pkgs/games/minecraft/default.nix11
1 files changed, 5 insertions, 6 deletions
diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix
index f3a8a34fa3b..6bceb40b523 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 = {