From 57e87cc0db82b0e4ed2ec7cfaec8c737e483acb3 Mon Sep 17 00:00:00 2001 From: Ryan Hendrickson Date: Sat, 20 Aug 2022 23:35:00 -0400 Subject: [PATCH] hyperrogue: 11.3o -> 12.0u --- pkgs/games/hyperrogue/default.nix | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/pkgs/games/hyperrogue/default.nix b/pkgs/games/hyperrogue/default.nix index c1a3eddd25f4..9fe1148be3ca 100644 --- a/pkgs/games/hyperrogue/default.nix +++ b/pkgs/games/hyperrogue/default.nix @@ -1,20 +1,27 @@ -{ lib, stdenv, fetchFromGitHub, SDL, SDL_ttf, SDL_gfx, SDL_mixer, autoreconfHook, - libpng, glew, makeDesktopItem }: +{ lib, stdenv, fetchFromGitHub, SDL, SDL_ttf, SDL_gfx, SDL_mixer, libpng +, glew, dejavu_fonts, makeDesktopItem }: stdenv.mkDerivation rec { pname = "hyperrogue"; - version = "11.3o"; + version = "12.0u"; src = fetchFromGitHub { owner = "zenorogue"; repo = "hyperrogue"; rev = "v${version}"; - sha256 = "0bijgbqpc867pq8lbwwvcnc713gm51mmz625xb5br0q2qw09nkyh"; + sha256 = "sha256-zG8Z+wpwr5z2r2CcjNxKOdiqXUN0AFChZcihUWel68A="; }; - CPPFLAGS = "-I${lib.getDev SDL}/include/SDL"; + CXXFLAGS = [ + "-I${lib.getDev SDL}/include/SDL" + "-DHYPERPATH='\"${placeholder "out"}/share/hyperrogue/\"'" + "-DRESOURCEDESTDIR=HYPERPATH" + "-DHYPERFONTPATH='\"${dejavu_fonts}/share/fonts/truetype/\"'" + ]; + HYPERROGUE_USE_GLEW = 1; + HYPERROGUE_USE_PNG = 1; - buildInputs = [ autoreconfHook SDL SDL_ttf SDL_gfx SDL_mixer libpng glew ]; + buildInputs = [ SDL SDL_ttf SDL_gfx SDL_mixer libpng glew ]; desktopItem = makeDesktopItem { name = "hyperrogue"; @@ -26,7 +33,14 @@ stdenv.mkDerivation rec { categories = [ "Game" "AdventureGame" ]; }; - postInstall = '' + installPhase = '' + install -d $out/share/hyperrogue/{sounds,music} + + install -m 555 -D hyperrogue $out/bin/hyperrogue + install -m 444 -D hyperrogue-music.txt *.dat $out/share/hyperrogue + install -m 444 -D music/* $out/share/hyperrogue/music + install -m 444 -D sounds/* $out/share/hyperrogue/sounds + install -m 444 -D ${desktopItem}/share/applications/hyperrogue.desktop \ $out/share/applications/hyperrogue.desktop install -m 444 -D hyperroid/app/src/main/res/drawable-ldpi/icon.png \