swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 12:59:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #201427 from figsoda/path-var

Browse source 
nixos/environment: accept path for variables and sessionVariables
This commit is contained in:
figsoda 2022-12-27 15:02:29 -05:00 committed by GitHub
parent 4984fe2fb6 579f230b0a
commit 0eef5edd1f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
nixos/modules/config/shells-environment.nix
View file

@ -42,8 +42,8 @@ in
strings. The latter is concatenated, interspersed with colon strings. The latter is concatenated, interspersed with colon
characters. characters.
''; '';
type = with types; attrsOf (either str (listOf str)); type = with types; attrsOf (oneOf [ str path (listOf str) ]);
apply = mapAttrs (n: v: if isList v then concatStringsSep ":" v else v); apply = mapAttrs (n: v: if isList v then concatStringsSep ":" v else "${v}");
}; };
environment.profiles = mkOption { environment.profiles = mkOption {

5
nixos/modules/config/system-environment.nix
View file

@ -1,6 +1,6 @@
# This module defines a system-wide environment that will be # This module defines a system-wide environment that will be
# initialised by pam_env (that is, not only in shells). # initialised by pam_env (that is, not only in shells).
{ config, lib, pkgs, ... }: { config, lib, options, pkgs, ... }:
with lib; with lib;
@ -32,8 +32,7 @@ in
therefore not possible to use PAM style variables such as therefore not possible to use PAM style variables such as
`@{HOME}`. `@{HOME}`.
''; '';
type = with types; attrsOf (either str (listOf str)); inherit (options.environment.variables) type apply;
apply = mapAttrs (n: v: if isList v then concatStringsSep ":" v else v);
}; };
environment.profileRelativeSessionVariables = mkOption { environment.profileRelativeSessionVariables = mkOption {