From 469419accf3b68e2d51c463fb4085c61476f4ecd Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Mon, 30 Oct 2023 21:14:18 +0100 Subject: [PATCH] meritous: 1.4 -> 1.5 https://gitlab.com/meritous/meritous/-/compare/v1.4...v1.5 --- pkgs/by-name/me/meritous/package.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/me/meritous/package.nix b/pkgs/by-name/me/meritous/package.nix index c7631f2370db5d9..c4822847e1705b3 100644 --- a/pkgs/by-name/me/meritous/package.nix +++ b/pkgs/by-name/me/meritous/package.nix @@ -1,20 +1,21 @@ { lib, stdenv, fetchFromGitLab, SDL, SDL_image, SDL_mixer, zlib }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "meritous"; - version = "1.4"; + version = "1.5"; src = fetchFromGitLab { owner = "meritous"; repo = "meritous"; - rev = "314af46d84d2746eec4c30a0f63cbc2e651d5303"; - sha256 = "1hrwm65isg5nwzydyd8gvgl3p36sbj09rsn228sppr8g5p9sm10x"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-6KK2anjX+fPsYf4HSOHQ0EQBINqZiVbxo1RmBR6pslg="; }; prePatch = '' substituteInPlace Makefile \ - --replace "CPPFLAGS +=" "CPPFLAGS += -DSAVES_IN_HOME -DDATADIR=\\\"$out/share/meritous\\\"" \ - --replace sld-config ${lib.getDev SDL}/bin/sdl-config + --replace "prefix=/usr/local" "prefix=$out" \ + --replace sdl-config ${lib.getDev SDL}/bin/sdl-config + substituteInPlace src/audio.c \ --replace "filename[64]" "filename[256]" ''; @@ -31,10 +32,9 @@ stdenv.mkDerivation { meta = with lib; { description = "Action-adventure dungeon crawl game"; - homepage = "http://www.asceai.net/meritous/"; - license = licenses.gpl3; + homepage = "https://gitlab.com/meritous/meritous"; + license = licenses.gpl3Only; maintainers = [ maintainers.alexvorobiev ]; platforms = platforms.linux; }; -} - +})