From 22e40999c03f84365636ff65c5f3316512042910 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Wed, 27 Apr 2016 13:41:18 +0200
Subject: more concise rmail

---
 custom/uucp.nix | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/custom/uucp.nix b/custom/uucp.nix
index 2db1e3f8..ef10c3ca 100644
--- a/custom/uucp.nix
+++ b/custom/uucp.nix
@@ -168,9 +168,7 @@ in {
       uucp = stdenv.lib.overrideDerivation uucp (oldAttrs: {
         configureFlags = "--with-newconfigdir=/etc/uucp";
       });
-      rmail = stdenv.mkDerivation {
-        name = "rmail";
-        src = pkgs.writeScript "rmail" ''
+      rmail = pkgs.writeScriptBin "rmail" ''
           #!${pkgs.stdenv.shell}
 
           # Dummy UUCP rmail command for postfix/qmail systems
@@ -184,12 +182,6 @@ in {
 
           exec /var/setuid-wrappers/sendmail -i -f "$from" -- "$@"
         '';
-        builder = pkgs.writeScript "builder" ''
-          #!${stdenv.shell}
-          mkdir -p $out/bin
-          ln -s $src $out/bin/rmail
-        '';
-      };
     };
 
     environment.systemPackages = with pkgs; [
-- 
cgit v1.2.3