diff options
author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-08-23 01:06:51 +0300 |
---|---|---|
committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-08-23 01:18:10 +0300 |
commit | 74a3a2cd7e409062ad3efa61e84d366a8f67c853 (patch) | |
tree | 3c12e08e51c0d1a2ec942ca02cb9cdbcc407b35d /nixos/modules/services/misc | |
parent | c2553952195cb390c9ae65e2a31ad02cc82d0f76 (diff) | |
download | nixlib-74a3a2cd7e409062ad3efa61e84d366a8f67c853.tar nixlib-74a3a2cd7e409062ad3efa61e84d366a8f67c853.tar.gz nixlib-74a3a2cd7e409062ad3efa61e84d366a8f67c853.tar.bz2 nixlib-74a3a2cd7e409062ad3efa61e84d366a8f67c853.tar.lz nixlib-74a3a2cd7e409062ad3efa61e84d366a8f67c853.tar.xz nixlib-74a3a2cd7e409062ad3efa61e84d366a8f67c853.tar.zst nixlib-74a3a2cd7e409062ad3efa61e84d366a8f67c853.zip |
treewide: Use makeBinPath
Diffstat (limited to 'nixos/modules/services/misc')
-rw-r--r-- | nixos/modules/services/misc/gitlab.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 33163d9789b2..39283d2d9437 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -121,7 +121,7 @@ let makeWrapper ${cfg.packages.gitlab.env}/bin/bundle $out/bin/gitlab-bundle \ ${concatStrings (mapAttrsToList (name: value: "--set ${name} '${value}' ") gitlabEnv)} \ --set GITLAB_CONFIG_PATH '${cfg.statePath}/config' \ - --set PATH '${pkgs.nodejs}/bin:${pkgs.gzip}/bin:${config.services.postgresql.package}/bin:$PATH' \ + --set PATH '${stdenv.lib.makeBinPath [ pkgs.nodejs pkgs.gzip config.services.postgresql.package ]}:$PATH' \ --set RAKEOPT '-f ${cfg.packages.gitlab}/share/gitlab/Rakefile' \ --run 'cd ${cfg.packages.gitlab}/share/gitlab' makeWrapper $out/bin/gitlab-bundle $out/bin/gitlab-rake \ |