Merge branch 'nixpkgs-update' into master

1 files changed, 9 insertions, 8 deletions

diff --git a/pkgs/games/ufoai/default.nix b/pkgs/games/ufoai/default.nix
index 94a12774a43..89f8f5ec91b 100644
--- a/pkgs/games/ufoai/default.nix
+++ b/pkgs/games/ufoai/default.nix
@@ -1,22 +1,23 @@
-{ stdenv, fetchurl, libtheora, xvidcore, libGLU, libGL, SDL, SDL_ttf, SDL_mixer
+{ lib, stdenv, fetchurl, libtheora, xvidcore, libGLU, libGL, SDL, SDL_ttf, SDL_mixer
 , curl, libjpeg, libpng, gettext, cunit, enableEditor?false }:
 
 stdenv.mkDerivation rec {
-  name = "ufoai-2.4";
+  pname = "ufoai";
+  version = "2.4";
   src = fetchurl {
-    url = "mirror://sourceforge/ufoai/${name}-source.tar.bz2";
+    url = "mirror://sourceforge/ufoai/ufoai-${version}-source.tar.bz2";
     sha256 = "0kxrbcjrharcwz319s90m789i4my9285ihp5ax6kfhgif2vn2ji5";
   };
 
   srcData = fetchurl {
-    url = "mirror://sourceforge/ufoai/${name}-data.tar";
+    url = "mirror://sourceforge/ufoai/ufoai-${version}-data.tar";
     sha256 = "1drhh08cqqkwv1yz3z4ngkplr23pqqrdx6cp8c3isy320gy25cvb";
   };
 
   preConfigure = ''tar xvf "${srcData}"'';
 
   configureFlags = [ "--enable-release" "--enable-sse" ]
-    ++ stdenv.lib.optional enableEditor "--enable-uforadiant";
+    ++ lib.optional enableEditor "--enable-uforadiant";
 
   buildInputs = [
     libtheora xvidcore libGLU libGL SDL SDL_ttf SDL_mixer
@@ -28,9 +29,9 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://ufoai.org";
     description = "A squad-based tactical strategy game in the tradition of X-Com";
-    license = stdenv.lib.licenses.gpl2Plus;
-    maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [viric];
+    platforms = lib.platforms.linux;
     hydraPlatforms = [];
   };
 }