diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2016-10-09 13:54:14 +0200 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2016-10-09 13:54:14 +0200 |
| commit | 0d4ce99e87d5f7673bb40f345ea8021f31d93b5e (patch) | |
| tree | 17bcd37e16b472f1341815544a4766bdd99cf45c /modules/programs | |
| parent | d5094e6c76ba3a9c58672d58dad52ef4dcde1836 (diff) | |
programs/gnupg: Use runCommandCC for wrappers
Since NixOS/nixpkgs@97bfc2fac92d90c668ae1ec078356d0bd0a9ddb7, runCommand uses stdenvNoCC, so we don't have a compiler available anymore. However, there is now a runCommandCC function which does exactly what we want. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'modules/programs')
| -rw-r--r-- | modules/programs/gnupg/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/programs/gnupg/default.nix b/modules/programs/gnupg/default.nix index 1b220a72..d938a184 100644 --- a/modules/programs/gnupg/default.nix +++ b/modules/programs/gnupg/default.nix @@ -15,7 +15,7 @@ let then "$XDG_RUNTIME_DIR/gnupg" else "$HOME/${cfg.homeDir}"; - pinentryWrapper = pkgs.runCommand "pinentry-wrapper" { + pinentryWrapper = pkgs.runCommandCC "pinentry-wrapper" { pinentryProgram = cfg.agent.pinentry.program; } '' cc -Wall -std=gnu11 -DPINENTRY_PROGRAM=\"$pinentryProgram\" \ @@ -28,7 +28,7 @@ let UNIX-CONNECT:"${shellSockDir}/S.scdaemon" ''; - agentWrapper = pkgs.runCommand "gpg-agent-wrapper" { + agentWrapper = pkgs.runCommandCC "gpg-agent-wrapper" { buildInputs = with pkgs; [ pkgconfig systemd ]; inherit pinentryWrapper; } '' |