about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2019-09-11 15:11:34 +0200
committerAlyssa Ross <hi@alyssa.is>2019-09-16 22:14:02 +0000
commitc9e5750c7aba82e8d0899c7ee2ed0e0a7e1bfba2 (patch)
tree3237615fbffb691083c5a0a1d173c9e61447059f
parente6a22bff9b2f8bd6385580084bceb3ccc39705bb (diff)
downloadnixlib-c9e5750c7aba82e8d0899c7ee2ed0e0a7e1bfba2.tar
nixlib-c9e5750c7aba82e8d0899c7ee2ed0e0a7e1bfba2.tar.gz
nixlib-c9e5750c7aba82e8d0899c7ee2ed0e0a7e1bfba2.tar.bz2
nixlib-c9e5750c7aba82e8d0899c7ee2ed0e0a7e1bfba2.tar.lz
nixlib-c9e5750c7aba82e8d0899c7ee2ed0e0a7e1bfba2.tar.xz
nixlib-c9e5750c7aba82e8d0899c7ee2ed0e0a7e1bfba2.tar.zst
nixlib-c9e5750c7aba82e8d0899c7ee2ed0e0a7e1bfba2.zip
nixos/mailman: create "mailman" executable as a proper wrapper script
(cherry picked from commit a7941fe21044a2c7656270111a78d9c23746611e)
-rw-r--r--nixpkgs/nixos/modules/services/mail/mailman.nix10
1 files changed, 5 insertions, 5 deletions
diff --git a/nixpkgs/nixos/modules/services/mail/mailman.nix b/nixpkgs/nixos/modules/services/mail/mailman.nix
index f30689e4e0ab..2e41bd885e9a 100644
--- a/nixpkgs/nixos/modules/services/mail/mailman.nix
+++ b/nixpkgs/nixos/modules/services/mail/mailman.nix
@@ -6,17 +6,17 @@ let
 
   cfg = config.services.mailman;
 
-  mailmanPyEnv = pkgs.python3.withPackages (ps: [ps.mailman ps.mailman-hyperkitty]);
+  mailmanPyEnv = pkgs.python3.withPackages (ps: with ps; [mailman mailman-hyperkitty]);
 
   mailmanExe = with pkgs; stdenv.mkDerivation {
     name = "mailman-" + python3Packages.mailman.version;
+    buildInputs = [makeWrapper];
     unpackPhase = ":";
     installPhase = ''
       mkdir -p $out/bin
-      sed >"$out/bin/mailman" <"${mailmanPyEnv}/bin/mailman" \
-        -e "2 iexport MAILMAN_CONFIG_FILE=/etc/mailman.cfg"
-      chmod +x $out/bin/mailman
-    '';
+      makeWrapper ${mailmanPyEnv}/bin/mailman $out/bin/mailman \
+        --set MAILMAN_CONFIG_FILE /etc/mailman.cfg
+   '';
   };
 
   mailmanCfg = ''