Merge commit '891f607d5301d6730cb1f9dcf3618bcb1ab7f10e'

1 files changed, 10 insertions, 14 deletions

diff --git a/nixpkgs/pkgs/games/blobby/default.nix b/nixpkgs/pkgs/games/blobby/default.nix
index ea8bddfa16d4..9dad0b84d1e3 100644
--- a/nixpkgs/pkgs/games/blobby/default.nix
+++ b/nixpkgs/pkgs/games/blobby/default.nix
@@ -1,24 +1,21 @@
-{stdenv, fetchurl, SDL2, SDL2_image, libGLU, libGL, cmake, physfs, boost, zip, zlib
-, pkgconfig, unzip}:
+{ lib, stdenv, fetchurl, SDL2, SDL2_image, libGLU, libGL, cmake, physfs, boost, zip, zlib, pkg-config }:
+
 stdenv.mkDerivation rec {
-  version = "1.0";
   pname = "blobby-volley";
+  version = "1.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/blobby/Blobby%20Volley%202%20%28Linux%29/1.0/blobby2-linux-1.0.tar.gz";
     sha256 = "1qpmbdlyhfbrdsq4vkb6cb3b8mh27fpizb71q4a21ala56g08yms";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [SDL2 SDL2_image libGLU libGL cmake physfs boost zip zlib
-    unzip];
+  nativeBuildInputs = [ cmake pkg-config zip ];
+  buildInputs = [ SDL2 SDL2_image libGLU libGL physfs boost zlib ];
 
   preConfigure=''
     sed -e '1i#include <iostream>' -i src/NetworkMessage.cpp
   '';
 
-  inherit unzip;
-
   postInstall = ''
     cp ../data/Icon.bmp "$out/share/blobby/"
     mv "$out/bin"/blobby{,.bin}
@@ -26,13 +23,12 @@ stdenv.mkDerivation rec {
     chmod a+x "$out/bin/blobby"
   '';
 
-  meta = {
-    description = ''A blobby volleyball game'';
-    license = stdenv.lib.licenses.bsd3;
-    platforms = with stdenv.lib.platforms; linux;
-    maintainers = with stdenv.lib.maintainers; [raskin];
+  meta = with lib; {
+    description = "A blobby volleyball game";
+    license = licenses.bsd3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ raskin ];
     homepage = "http://blobby.sourceforge.net/";
     downloadPage = "https://sourceforge.net/projects/blobby/files/Blobby%20Volley%202%20%28Linux%29/";
-    inherit version;
   };
 }