From 75959982e5a2b3c8c701842d151012404e2e5f1b Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Thu, 12 Aug 2021 22:28:38 +0200 Subject: [PATCH] games: replace name with pname&version --- pkgs/games/egoboo/default.nix | 11 ++++++----- pkgs/games/onscripter-en/default.nix | 3 ++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/games/egoboo/default.nix b/pkgs/games/egoboo/default.nix index 56ebcb1444ed..158e81d91288 100644 --- a/pkgs/games/egoboo/default.nix +++ b/pkgs/games/egoboo/default.nix @@ -5,10 +5,11 @@ stdenv.mkDerivation rec { # they fix more, because it even has at least one bugs less than 2.7.4. # 2.8.0 does not start properly on linux # They just starting making that 2.8.0 work on linux. - name = "egoboo-2.7.3"; + pname = "egoboo"; + version = "2.7.3"; src = fetchurl { - url = "mirror://sourceforge/egoboo/${name}.tar.gz"; + url = "mirror://sourceforge/egoboo/egoboo-${version}.tar.gz"; sha256 = "18cjgp9kakrsa90jcb4cl8hhh9k57mi5d1sy5ijjpd3p7zl647hd"; }; @@ -22,10 +23,10 @@ stdenv.mkDerivation rec { # The user will need to have all the files in '.' to run egoboo, with # writeable controls.txt and setup.txt installPhase = '' - mkdir -p $out/share/${name} - cp -v game/egoboo $out/share/${name} + mkdir -p $out/share/egoboo-${version} + cp -v game/egoboo $out/share/egoboo-${version} cd .. - cp -v -Rd controls.txt setup.txt players modules basicdat $out/share/${name} + cp -v -Rd controls.txt setup.txt players modules basicdat $out/share/egoboo-${version} ''; buildInputs = [ libGLU libGL SDL SDL_mixer SDL_image SDL_ttf ]; diff --git a/pkgs/games/onscripter-en/default.nix b/pkgs/games/onscripter-en/default.nix index bcd33eb98928..82de61e41893 100644 --- a/pkgs/games/onscripter-en/default.nix +++ b/pkgs/games/onscripter-en/default.nix @@ -4,7 +4,8 @@ stdenv.mkDerivation { - name = "onscripter-en-20110930"; + pname = "onscripter-en"; + version = "20110930"; src = fetchurl { # The website is not available now.