diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-12-21 12:01:23 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-21 12:01:23 +0000 |
| commit | 0757d9c1561d0fb38b43a3d3cfd08cf30f7af7f9 (patch) | |
| tree | 967a8bf3c516cc587da09feb8e44b6ebbded40a2 /pkgs/games | |
| parent | 842f26c1de49d2565b5b589468b056e754a3ea89 (diff) | |
| parent | 8572c5f792b6f823be5b8c05b96b598337cd8248 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/quantumminigolf/default.nix | 44 | ||||
| -rw-r--r-- | pkgs/games/quantumminigolf/default.upstream | 4 |
2 files changed, 21 insertions, 27 deletions
diff --git a/pkgs/games/quantumminigolf/default.nix b/pkgs/games/quantumminigolf/default.nix index 61e2e1c4eb36..26a327dd3f52 100644 --- a/pkgs/games/quantumminigolf/default.nix +++ b/pkgs/games/quantumminigolf/default.nix @@ -1,40 +1,38 @@ -{lib, stdenv, fetchurl, fftwSinglePrec, freetype, SDL, SDL_ttf}: -let - s = # Generated upstream information - rec { - baseName="quantumminigolf"; - version="1.1.1"; - name="${baseName}-${version}"; - hash="16av7fk0irhi5nd7y9h9vhb0kf0dk12p6976ai3f60m99qdd8wk3"; - url="mirror://sourceforge/project/quantumminigolf/quantumminigolf/1.1.1/quantumminigolf-1.1.1.src.tar.gz"; - sha256="16av7fk0irhi5nd7y9h9vhb0kf0dk12p6976ai3f60m99qdd8wk3"; +{ lib, stdenv, fetchurl, fftwSinglePrec, freetype, SDL, SDL_ttf }: + +stdenv.mkDerivation rec { + pname = "quantumminigolf"; + version = "1.1.1"; + + src = fetchurl { + url = "mirror://sourceforge/project/quantumminigolf/quantumminigolf/${version}/quantumminigolf-${version}.src.tar.gz"; + sha256 = "sha256-Y3LUGk6pAuNGVOYkc0WYDbgJFtwJJn+aLRHmCKY7W5k="; }; + buildInputs = [ - fftwSinglePrec freetype SDL SDL_ttf + fftwSinglePrec + freetype + SDL + SDL_ttf ]; -in -stdenv.mkDerivation { - inherit (s) name version; - inherit buildInputs; - src = fetchurl { - inherit (s) url sha256; - }; + preBuild = '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${SDL.dev}/include/SDL -I${SDL_ttf}/include/SDL" sed -re 's@"(gfx|fonts|tracks)/@"'"$out"'/share/quantumminigolf/\1/@g' -i *.cpp ''; + installPhase = '' mkdir -p "$out"/{share/doc,share/quantumminigolf,bin} cp README THANKS LICENSE "$out/share/doc" cp -r fonts gfx tracks "$out/share/quantumminigolf" cp quantumminigolf "$out/bin" ''; - meta = { - inherit (s) version; + + meta = with lib; { description = "Quantum mechanics-based minigolf-like game"; - license = lib.licenses.gpl2 ; - maintainers = [lib.maintainers.raskin]; - platforms = lib.platforms.linux; + license = licenses.gpl2; + maintainers = with maintainers; [ raskin ]; + platforms = platforms.linux; }; } diff --git a/pkgs/games/quantumminigolf/default.upstream b/pkgs/games/quantumminigolf/default.upstream deleted file mode 100644 index a994bb1a6cbe..000000000000 --- a/pkgs/games/quantumminigolf/default.upstream +++ /dev/null @@ -1,4 +0,0 @@ -url https://sourceforge.net/projects/quantumminigolf/files/quantumminigolf/ -SF_version_dir -version_link '[.]tar[.][^.]+/download$' -SF_redirect |