From ffdc3dc13f20dabd7a0fbdd28ae1e5321fd1f149 Mon Sep 17 00:00:00 2001
From: Ingo Blechschmidt <iblech@web.de>
Date: Mon, 11 Jan 2021 16:50:59 +0100
Subject: fish-fillets-ng: minor cleanup so tests pass

---
 pkgs/games/fish-fillets-ng/default.nix | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

(limited to 'pkgs/games/fish-fillets-ng')

diff --git a/pkgs/games/fish-fillets-ng/default.nix b/pkgs/games/fish-fillets-ng/default.nix
index 9b5ee627394..8870fe21ab9 100644
--- a/pkgs/games/fish-fillets-ng/default.nix
+++ b/pkgs/games/fish-fillets-ng/default.nix
@@ -1,7 +1,9 @@
-{stdenv, fetchurl, makeDesktopItem, copyDesktopItems, SDL, lua5_1, pkgconfig, SDL_mixer, SDL_image, SDL_ttf}:
+{ lib, stdenv, fetchurl, makeDesktopItem, copyDesktopItems, SDL, lua5_1, pkg-config, SDL_mixer, SDL_image, SDL_ttf }:
+
 stdenv.mkDerivation rec {
   pname = "fish-fillets-ng";
   version = "1.0.1";
+
   src = fetchurl {
     url = "mirror://sourceforge/fillets/fillets-ng-${version}.tar.gz";
     sha256 = "1nljp75aqqb35qq3x7abhs2kp69vjcj0h1vxcpdyn2yn2nalv6ij";
@@ -10,8 +12,10 @@ stdenv.mkDerivation rec {
     url = "mirror://sourceforge/fillets/fillets-ng-data-${version}.tar.gz";
     sha256 = "169p0yqh2gxvhdilvjc2ld8aap7lv2nhkhkg4i1hlmgc6pxpkjgh";
   };
-  nativeBuildInputs = [ pkgconfig copyDesktopItems ];
-  buildInputs = [SDL lua5_1 SDL_mixer SDL_image SDL_ttf];
+
+  nativeBuildInputs = [ pkg-config copyDesktopItems ];
+  buildInputs = [ SDL lua5_1 SDL_mixer SDL_image SDL_ttf ];
+
   desktopItems = [ (makeDesktopItem {
     name = "fish-fillets-ng";
     exec = "fillets";
@@ -20,20 +24,19 @@ stdenv.mkDerivation rec {
     comment     = "Puzzle game about witty fish saving the world sokoban-style";
     categories  = "Game;LogicGame;";
   }) ];
-  postInstall=''
-    # Install game data
-    mkdir -p "$out/share/games/fillets-ng/"
-    tar -xf ${data} -C "$out/share/games/fillets-ng/" --strip-components=1
-    
-    # Install game icon
+
+  postInstall = ''
+    mkdir -p $out/share/games/fillets-ng
+    tar -xf ${data} -C $out/share/games/fillets-ng --strip-components=1
     install -Dm644 ${./icon.xpm} $out/share/pixmaps/fish-fillets-ng.xpm
   '';
-  meta = {
+
+  meta = with lib; {
     inherit version;
     description = ''A puzzle game'';
-    license = stdenv.lib.licenses.gpl2Plus;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ raskin ];
+    platforms = platforms.linux;
     homepage = "http://fillets.sourceforge.net/";
   };
 }
-- 
cgit 1.4.1