Unverified Commit 0eef5edd authored by figsoda's avatar figsoda Committed by GitHub
Browse files

Merge pull request #201427 from figsoda/path-var 

nixos/environment: accept path for variables and sessionVariables
parents 4984fe2f 579f230b

nixos/modules/config/shells-environment.nix

+2 −2
Original line number Diff line number Diff line
@@ -42,8 +42,8 @@ in 
        strings.  The latter is concatenated, interspersed with colon

        characters.

      '';

      type = with types; attrsOf (either str (listOf str));

      apply = mapAttrs (n: v: if isList v then concatStringsSep ":" v else v);

      type = with types; attrsOf (oneOf [ str path (listOf str) ]);

      apply = mapAttrs (n: v: if isList v then concatStringsSep ":" v else "${v}");

    };



    environment.profiles = mkOption {

nixos/modules/config/system-environment.nix

+2 −3
Original line number Diff line number Diff line 
# This module defines a system-wide environment that will be

# initialised by pam_env (that is, not only in shells).

{ config, lib, pkgs, ... }:

{ config, lib, options, pkgs, ... }:



with lib;
@@ -32,8 +32,7 @@ in 
        therefore not possible to use PAM style variables such as

        `@{HOME}`.

      '';

      type = with types; attrsOf (either str (listOf str));

      apply = mapAttrs (n: v: if isList v then concatStringsSep ":" v else v);

      inherit (options.environment.variables) type apply;

    };



    environment.profileRelativeSessionVariables = mkOption {