mirror of
https://gitlab.com/simple-nixos-mailserver/nixos-mailserver.git
synced 2025-01-26 12:58:34 +01:00
Merge branch 'cross-compatible' into 'master'
fix for cross-compile See merge request simple-nixos-mailserver/nixos-mailserver!245
This commit is contained in:
commit
177daedc4d
1 changed files with 19 additions and 16 deletions
|
@ -43,22 +43,25 @@ let
|
|||
|
||||
stateDir = "/var/lib/dovecot";
|
||||
|
||||
pipeBin = pkgs.stdenv.mkDerivation {
|
||||
name = "pipe_bin";
|
||||
src = ./dovecot/pipe_bin;
|
||||
buildInputs = with pkgs; [ makeWrapper coreutils bash rspamd ];
|
||||
buildCommand = ''
|
||||
mkdir -p $out/pipe/bin
|
||||
cp $src/* $out/pipe/bin/
|
||||
chmod a+x $out/pipe/bin/*
|
||||
patchShebangs $out/pipe/bin
|
||||
pipeBin_ = { makeWrapper, coreutils, bash, rspamd }:
|
||||
pkgs.stdenv.mkDerivation {
|
||||
name = "pipe_bin";
|
||||
src = ./dovecot/pipe_bin;
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ coreutils bash rspamd ];
|
||||
buildCommand = ''
|
||||
mkdir -p $out/pipe/bin
|
||||
cp $src/* $out/pipe/bin/
|
||||
chmod a+x $out/pipe/bin/*
|
||||
patchShebangs $out/pipe/bin
|
||||
|
||||
for file in $out/pipe/bin/*; do
|
||||
wrapProgram $file \
|
||||
--set PATH "${pkgs.coreutils}/bin:${pkgs.rspamd}/bin"
|
||||
done
|
||||
'';
|
||||
};
|
||||
for file in $out/pipe/bin/*; do
|
||||
wrapProgram $file \
|
||||
--set PATH "${coreutils}/bin:${rspamd}/bin"
|
||||
done
|
||||
'';
|
||||
};
|
||||
pipeBin = pkgs.callPackage pipeBin_ { };
|
||||
|
||||
|
||||
ldapConfig = pkgs.writeTextFile {
|
||||
|
@ -96,7 +99,7 @@ let
|
|||
};
|
||||
|
||||
genPasswdScript = pkgs.writeScript "generate-password-file" ''
|
||||
#!${pkgs.stdenv.shell}
|
||||
#!${pkgs.runtimeShell}
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
|
|
Loading…
Reference in a new issue