From c9e5750c7aba82e8d0899c7ee2ed0e0a7e1bfba2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 11 Sep 2019 15:11:34 +0200 Subject: nixos/mailman: create "mailman" executable as a proper wrapper script (cherry picked from commit a7941fe21044a2c7656270111a78d9c23746611e) --- nixpkgs/nixos/modules/services/mail/mailman.nix | 10 +++++----- 1 file 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 = '' -- cgit 1.4.1