From 73184f5f59db0ecb46d09cf6a26111493496c1ea Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Tue, 29 Dec 2015 15:16:12 +0100 Subject: [PATCH] stardust: use stdenv This replaces use of builderDefsPackage (#4210). --- pkgs/games/stardust/default.nix | 77 ++++++++++----------------------- 1 file changed, 23 insertions(+), 54 deletions(-) diff --git a/pkgs/games/stardust/default.nix b/pkgs/games/stardust/default.nix index c7ee0df6a7a3..aa68da6b73d0 100644 --- a/pkgs/games/stardust/default.nix +++ b/pkgs/games/stardust/default.nix @@ -1,62 +1,31 @@ -x@{builderDefsPackage - , zlib, libtiff, libxml2, SDL, xproto, libX11, libXi, inputproto, libXmu - , libXext, xextproto, mesa - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; +{ stdenv, fetchurl, zlib, libtiff, libxml2, SDL, xproto, libX11 +, libXi, inputproto, libXmu, libXext, xextproto, mesa }: - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - baseName="stardust"; - version="0.1.13"; - name="${baseName}-${version}"; - url="http://iwar.free.fr/IMG/gz/${name}.tar.gz"; - hash="19rs9lz5y5g2yiq1cw0j05b11digw40gar6rw8iqc7bk3s8355xp"; - }; -in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.hash; +stdenv.mkDerivation rec { + name = "stardust-${version}"; + version = "0.1.13"; + + src = fetchurl { + url = "http://iwar.free.fr/IMG/gz/${name}.tar.gz"; + sha256 = "19rs9lz5y5g2yiq1cw0j05b11digw40gar6rw8iqc7bk3s8355xp"; }; - inherit (sourceInfo) name version; - inherit buildInputs; - - /* doConfigure should be removed if not needed */ - phaseNames = ["doConfigure" "fixPaths" "doMakeInstall"]; - - configureFlags = [ - "--bindir=$out/bin" - "--datadir=$out/share" - ]; - - makeFlags = [ - "bindir=$out/bin" - "datadir=$out/share" + buildInputs = [ + zlib libtiff libxml2 SDL xproto libX11 libXi inputproto + libXmu libXext xextproto mesa ]; - fixPaths = a.fullDepEntry ('' - sed -e "s@#define PACKAGE .*@#define PACKAGE \"stardust\"@" -i config.h - '') ["minInit"]; + installFlags = [ "bindir=\${out}/bin" ]; - meta = { + postConfigure = '' + substituteInPlace config.h \ + --replace '#define PACKAGE ""' '#define PACKAGE "stardust"' + ''; + + meta = with stdenv.lib; { description = "Space flight simulator"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - linux; + maintainers = [ maintainers.raskin ]; + platforms = platforms.linux; + license = licenses.gpl2Plus; }; - passthru = { - updateInfo = { - downloadPage = "http://iwar.free.fr/article.php3?id_article=6"; - }; - }; -}) x - +}