Merge pull request #206441 from SuperSandro2000/msmtp

Sandro ac210fc1 ace7950a

Changed files
+5 -4
nixos
modules
config
pkgs
applications
networking
msmtp
+1
nixos/modules/config/no-x-libs.nix
···
imagemagickBig = super.imagemagickBig.override { libX11Support = false; libXtSupport = false; };
libextractor = super.libextractor.override { gstreamerSupport = false; gtkSupport = false; };
libva = super.libva-minimal;
+
msmtp = super.msmtp.override { withKeyring = false; };
networkmanager-fortisslvpn = super.networkmanager-fortisslvpn.override { withGnome = false; };
networkmanager-iodine = super.networkmanager-iodine.override { withGnome = false; };
networkmanager-l2tp = super.networkmanager-l2tp.override { withGnome = false; };
+4 -4
pkgs/applications/networking/msmtp/default.nix
···
, which
, Security
, withKeyring ? true
-
, libsecret ? null
+
, libsecret
, withSystemd ? stdenv.isLinux
-
, systemd ? null
+
, systemd
}:
let
···
platforms = platforms.unix;
};
-
binaries = stdenv.mkDerivation rec {
+
binaries = stdenv.mkDerivation {
pname = "msmtp-binaries";
inherit version src meta;
···
'';
};
-
scripts = resholve.mkDerivation rec {
+
scripts = resholve.mkDerivation {
pname = "msmtp-scripts";
inherit version src meta;