movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 13:40:28 +03:00
Code Activity

nixos/*: use $out instead of $bin with buildGoPackage

Browse source
This commit is contained in:
zowoq 2020-04-28 11:50:34 +10:00
parent 3f17518490
commit c59c4e3589
23 changed files with 41 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

3
nixos/modules/virtualisation/ecs-agent.nix
View file

@ -38,9 +38,8 @@ in {
if [ ! -z "$ECS_DATADIR" ]; then
mkdir -p "$ECS_DATADIR"
fi
${cfg.package.bin}/bin/agent
${cfg.package}/bin/agent
'';
};
};
}

2
nixos/modules/virtualisation/lxd.nix
View file

@ -108,7 +108,7 @@ in
'';
serviceConfig = {
ExecStart = "@${cfg.package.bin}/bin/lxd lxd --group lxd";
ExecStart = "@${cfg.package}/bin/lxd lxd --group lxd";
Type = "simple";
KillMode = "process"; # when stopping, leave the containers alone
LimitMEMLOCK = "infinity";

8
nixos/modules/virtualisation/podman.nix
View file

@ -6,13 +6,11 @@ let
# Provides a fake "docker" binary mapping to podman
dockerCompat = pkgs.runCommandNoCC "${pkgs.podman.pname}-docker-compat-${pkgs.podman.version}" {
outputs = [ "out" "bin" "man" ];
outputs = [ "out" "man" ];
inherit (pkgs.podman) meta;
} ''
mkdir $out
mkdir -p $bin/bin
ln -s ${pkgs.podman.bin}/bin/podman $bin/bin/docker
mkdir -p $out/bin
ln -s ${pkgs.podman}/bin/podman $out/bin/docker
mkdir -p $man/share/man/man1
for f in ${pkgs.podman.man}/share/man/man1/*; do