From 5ddd4812a906aba4294c14c03672a2f7b7268c94 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Fri, 3 Apr 2015 16:36:56 +0200 Subject: udftools: reimplement using mkDerivation --- pkgs/tools/filesystems/udftools/default.nix | 57 ++++++++--------------------- 1 file changed, 15 insertions(+), 42 deletions(-) (limited to 'pkgs/tools/filesystems/udftools') diff --git a/pkgs/tools/filesystems/udftools/default.nix b/pkgs/tools/filesystems/udftools/default.nix index fae14102e5133..88153f7cb39ce 100644 --- a/pkgs/tools/filesystems/udftools/default.nix +++ b/pkgs/tools/filesystems/udftools/default.nix @@ -1,51 +1,24 @@ -x@{builderDefsPackage - , ncurses, readline - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; +{ stdenv, fetchurl, ncurses, readline }: - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - baseName="udftools"; - version="1.0.0b3"; - name="${baseName}-${version}"; - project="linux-udf"; - url="mirror://sourceforge/${project}/${baseName}/${version}/${name}.tar.gz"; - hash="180414z7jblby64556i8p24rcaas937zwnyp1zg073jdin3rw1y5"; - }; -in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.hash; +stdenv.mkDerivation rec { + name = "udftools-${version}"; + version = "1.0.0b3"; + src = fetchurl { + url = "mirror://sourceforge/linux-udf/udftools/${version}/${name}.tar.gz"; + sha256 = "180414z7jblby64556i8p24rcaas937zwnyp1zg073jdin3rw1y5"; }; - inherit (sourceInfo) name version; - inherit buildInputs; + buildInputs = [ ncurses readline ]; - /* doConfigure should be removed if not needed */ - phaseNames = ["fixIncludes" "doConfigure" "doMakeInstall"]; - - fixIncludes = a.fullDepEntry '' + preConfigure = '' sed -e '1i#include ' -i cdrwtool/cdrwtool.c -i pktsetup/pktsetup.c sed -e 's@[(]char[*][)]spm [+]=@spm = ((char*) spm) + @' -i wrudf/wrudf.c - '' ["doUnpack" "minInit"]; + ''; - meta = { + meta = with stdenv.lib; { description = "UDF tools"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - linux; - license = a.lib.licenses.gpl2Plus; - }; - passthru = { + maintainers = with maintainers; [ raskin ]; + platforms = with platforms; linux; + license = licenses.gpl2Plus; }; -}) x - +} -- cgit 1.4.1