* Fix some more "args: with args".

svn path=/nixpkgs/trunk/; revision=22828

1 files changed, 41 insertions, 37 deletions

diff --git a/pkgs/tools/system/fcron/default.nix b/pkgs/tools/system/fcron/default.nix
index 6ad363d2d553..233a0c39d171 100644
--- a/pkgs/tools/system/fcron/default.nix
+++ b/pkgs/tools/system/fcron/default.nix
@@ -2,51 +2,55 @@
 # restart using 'killall -TERM fcron; fcron -b
 # use convert-fcrontab to update fcrontab files
 
-args:
-args.stdenv.mkDerivation {
+{ stdenv, fetchurl, perl }:
+
+stdenv.mkDerivation {
   name = "fcron-3.0.4";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = http://fcron.free.fr/archives/fcron-3.0.4.src.tar.gz;
     sha256 = "15kgphsfa0nqgjd8yxyz947x2xyljj4iyh298kw4c8bz6iznqxn8";
   };
 
-  buildInputs =(with args; [perl]);
-
-  configureFlags = [ "--with-sendmail=/var/setuid-wrappers/sendmail"
-                    "--with-editor=/var/run/current-system/sw/bin/vi"
-                    "--with-bootinstall=no"
-                    "--sysconfdir=/etc"
-                    # fcron would have been default user/grp
-                    "--with-username=root"
-                    "--with-groupname=root"
-                    # fcron must not try to verify that sendmail has already been installed int /var/setuid-wrappers/sendmail
-                    "--disable-checks"
-                  ];
+  buildInputs = [ perl ];
+
+  configureFlags =
+    [ "--with-sendmail=/var/setuid-wrappers/sendmail"
+      "--with-editor=/var/run/current-system/sw/bin/vi"
+      "--with-bootinstall=no"
+      "--sysconfdir=/etc"
+      # fcron would have been default user/grp
+      "--with-username=root"
+      "--with-groupname=root"
+      # fcron must not try to verify that sendmail has already been installed int /var/setuid-wrappers/sendmail
+      "--disable-checks"
+    ];
+    
   installTargets = "install-staged"; # install does also try to change permissions of /etc/* files
-  preConfigure = ''
-    sed -i 's@/usr/bin/env perl@${args.perl}/bin/perl@g' configure script/*
-    # Don't let fcron create the group fcron, nix(os) should do this
-    sed -i '2s@.*@exit 0@' script/user-group
-
-    # --with-bootinstall=no shoud do this, didn't work. So just exit the script before doing anything
-    sed -i '2s@.*@exit 0@' script/boot-install
-
-    # also don't use chown or chgrp for documentation (or whatever) when installing
-    find -type f | xargs sed -i -e 's@^\(\s\)*chown@\1:@' -e 's@^\(\s\)*chgrp@\1:@'
-
-  '';
-
-  patchPhase = ''
-    # don't try to create /etc/fcron.{allow,deny,conf} 
-
-    sed -i -e 's@test -f $(DESTDIR)$(ETC)/fcron.conf @ # @' \
-           -e 's@if test ! -f $(DESTDIR)$(ETC)/fcron.allow@ # @' Makefile.in
-  '';
+  
+  preConfigure =
+    ''
+      sed -i 's@/usr/bin/env perl@${perl}/bin/perl@g' configure script/*
+      # Don't let fcron create the group fcron, nix(os) should do this
+      sed -i '2s@.*@exit 0@' script/user-group
+
+      # --with-bootinstall=no shoud do this, didn't work. So just exit the script before doing anything
+      sed -i '2s@.*@exit 0@' script/boot-install
+
+      # also don't use chown or chgrp for documentation (or whatever) when installing
+      find -type f | xargs sed -i -e 's@^\(\s\)*chown@\1:@' -e 's@^\(\s\)*chgrp@\1:@'
+    '';
+
+  patchPhase =
+    ''
+      # don't try to create /etc/fcron.{allow,deny,conf} 
+      sed -i -e 's@test -f $(DESTDIR)$(ETC)/fcron.conf @ # @' \
+             -e 's@if test ! -f $(DESTDIR)$(ETC)/fcron.allow@ # @' Makefile.in
+    '';
 
   meta = { 
-      description="A command scheduler with extended capabilities over cron and anacron";
-      homepage =  http://fcron.free.fr;
-      license = "GPLv2";
+    description="A command scheduler with extended capabilities over cron and anacron";
+    homepage = http://fcron.free.fr;
+    license = "GPLv2";
   };
 }