Commit aa0c0d5a authored by Valentin Reis's avatar Valentin Reis
Browse files

[pkgs] fix qmcpack string quoting

parent 95123a76
......@@ -189,32 +189,32 @@ in
};
};
slave1 =
{ ... }:
{
deployment.targetEnv = "none";
deployment.targetHost = "129.114.111.114";
require=argomodules;
environment.argo.known-hosts.enable=true;
environment.argo.provider-tacc.enable=true;
environment.argo.root-access.enable=true;
environment.variables.TERM = "xterm";
i18n.defaultLocale = "en_US.UTF-8";
nix.useSandbox = true;
nix.nrBuildUsers = 30;
services.ntp.enable = false;
services.openssh.allowSFTP = false;
nix.gc = {
automatic = true;
dates = "05:15";
options = ''--max-freed "$((32 * 1024**3 - 1024 * $(df -P -k /nix/store | tail -n 1 | ${pkgs.gawk}/bin/awk '{ print $4 }')))"'';
};
services.openssh.enable = true;
users.extraUsers.root.openssh.authorizedKeys.keys = [ (pkgs.lib.readFile ./keys/id_buildfarm.pub)];
};
#slave1 =
#{ ... }:
#{
#deployment.targetEnv = "none";
#deployment.targetHost = "129.114.111.114";
#require=argomodules;
#environment.argo.known-hosts.enable=true;
#environment.argo.provider-tacc.enable=true;
#environment.argo.root-access.enable=true;
#environment.variables.TERM = "xterm";
#i18n.defaultLocale = "en_US.UTF-8";
#nix.useSandbox = true;
#nix.nrBuildUsers = 30;
#services.ntp.enable = false;
#services.openssh.allowSFTP = false;
#nix.gc = {
#automatic = true;
#dates = "05:15";
#options = ''--max-freed "$((32 * 1024**3 - 1024 * $(df -P -k /nix/store | tail -n 1 | ${pkgs.gawk}/bin/awk '{ print $4 }')))"'';
#};
#services.openssh.enable = true;
#users.extraUsers.root.openssh.authorizedKeys.keys = [ (pkgs.lib.readFile ./keys/id_buildfarm.pub)];
#};
}
......@@ -58,7 +58,7 @@ in rec {
{
buildInputs = oldAttrs.buildInputs ++ [nodelevel.libnrm];
cmakeFlags = if (name=="qmcpack") then
(oldAttrs.cmakeFlags ++ [ ''-DQMC_INCLUDE="${nodelevel.libnrm}/include/"'' ''-DQMC_EXTRA_LIBS="${nodelevel.libnrm}/lib/libnrm.so'' ])
(oldAttrs.cmakeFlags ++ [ ''-DQMC_INCLUDE=${nodelevel.libnrm}/include/'' ''-DQMC_EXTRA_LIBS=${nodelevel.libnrm}/lib/libnrm.so'' ])
else
[];
});
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment