diff options
author | Robert Schütz <rschuetz17@gmail.com> | 2018-05-11 14:13:17 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-11 14:13:17 +0200 |
commit | d283368d73482886808b87453b838e1e85a392db (patch) | |
tree | 86ed56dca8f9ba782f3f9193ff0886a755d869e5 /nixos/modules/services/networking | |
parent | b15da3e3308d37b0c976ea809e3f4d07d7fdd6ad (diff) | |
parent | c3dba0b7a79c780ac8359f00d65af29930c7ae20 (diff) | |
download | nixlib-d283368d73482886808b87453b838e1e85a392db.tar nixlib-d283368d73482886808b87453b838e1e85a392db.tar.gz nixlib-d283368d73482886808b87453b838e1e85a392db.tar.bz2 nixlib-d283368d73482886808b87453b838e1e85a392db.tar.lz nixlib-d283368d73482886808b87453b838e1e85a392db.tar.xz nixlib-d283368d73482886808b87453b838e1e85a392db.tar.zst nixlib-d283368d73482886808b87453b838e1e85a392db.zip |
Merge pull request #39681 from pstn/gnunet-service
nixos/gnunet: create switch for package.
Diffstat (limited to 'nixos/modules/services/networking')
-rw-r--r-- | nixos/modules/services/networking/gnunet.nix | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/nixos/modules/services/networking/gnunet.nix b/nixos/modules/services/networking/gnunet.nix index 02cd53c6fa38..008b09e81a57 100644 --- a/nixos/modules/services/networking/gnunet.nix +++ b/nixos/modules/services/networking/gnunet.nix @@ -102,6 +102,14 @@ in }; }; + package = mkOption { + type = types.package; + default = pkgs.gnunet; + defaultText = "pkgs.gnunet"; + description = "Overridable attribute of the gnunet package to use."; + example = literalExample "pkgs.gnunet_git"; + }; + extraOptions = mkOption { default = ""; description = '' @@ -130,16 +138,16 @@ in # The user tools that talk to `gnunetd' should come from the same source, # so install them globally. - environment.systemPackages = [ pkgs.gnunet ]; + environment.systemPackages = [ cfg.package ]; systemd.services.gnunet = { description = "GNUnet"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - path = [ pkgs.gnunet pkgs.miniupnpc ]; + path = [ cfg.package pkgs.miniupnpc ]; environment.TMPDIR = "/tmp"; serviceConfig.PrivateTemp = true; - serviceConfig.ExecStart = "${pkgs.gnunet}/lib/gnunet/libexec/gnunet-service-arm -c ${configFile}"; + serviceConfig.ExecStart = "${cfg.package}/lib/gnunet/libexec/gnunet-service-arm -c ${configFile}"; serviceConfig.User = "gnunet"; serviceConfig.UMask = "0007"; serviceConfig.WorkingDirectory = homeDir; |