summaryrefslogtreecommitdiffstats
path: root/krebs/5pkgs
diff options
context:
space:
mode:
authorjeschli <jeschli@gmail.com>2018-02-09 16:58:59 +0100
committerjeschli <jeschli@gmail.com>2018-02-09 16:58:59 +0100
commitcf2e59b8066e88492c7b986ed9e1bd6bf7b9a360 (patch)
tree5fce956f7ff883f589b0626b98679bd64ee5b03f /krebs/5pkgs
parentab24f3c3a802eabef3f425d2b46e1b4ffc626e71 (diff)
parentd5aa4524f478a29779b4219e1a8dea10fef74065 (diff)
Merge branch 'master' of prism.r:stockholm
Diffstat (limited to 'krebs/5pkgs')
-rw-r--r--krebs/5pkgs/simple/ftb/default.nix20
1 files changed, 3 insertions, 17 deletions
diff --git a/krebs/5pkgs/simple/ftb/default.nix b/krebs/5pkgs/simple/ftb/default.nix
index 199c12b44..841e2ea00 100644
--- a/krebs/5pkgs/simple/ftb/default.nix
+++ b/krebs/5pkgs/simple/ftb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeDesktopItem
+{ stdenv, fetchurl
, jre, libX11, libXext, libXcursor, libXrandr, libXxf86vm
, openjdk
, mesa, openal
@@ -7,23 +7,12 @@ with stdenv.lib;
assert useAlsa -> alsaOss != null;
-let
- desktopItem = makeDesktopItem {
- name = "minecraft";
- exec = "minecraft";
- icon = "minecraft";
- comment = "A sandbox-building game";
- desktopName = "Minecraft";
- genericName = "minecraft";
- categories = "Game;";
- };
-
-in stdenv.mkDerivation {
+stdenv.mkDerivation {
name = "ftb";
src = fetchurl {
url = "http://ftb.cursecdn.com/FTB2/launcher/FTB_Launcher.jar";
- sha256 = "10ga4jgyfsj5dy4rj2rla0fpnfpnxv8r3bmxpqpwn7fsry4il79v";
+ sha256 = "0pyh83hhni97ryvz6yy8lyiagjrlx67cwr780s2bja92rxc1sqpj";
};
phases = "installPhase";
@@ -43,9 +32,6 @@ in stdenv.mkDerivation {
chmod +x $out/bin/ftb
- mkdir -p $out/share/applications
- ln -s ${desktopItem}/share/applications/* $out/share/applications/
-
${openjdk}/bin/jar xf $out/ftb.jar favicon.png
'';
}