From 0efda9cd6bcb696e2e420d97bcb51adc117e5783 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Wed, 14 Nov 2018 20:59:45 +0100 Subject: [PATCH] Use `preferLocalBuild` with `runCommand` --- modules/programs/direnv.nix | 16 +++++++++++----- modules/programs/obs-studio.nix | 19 ++++++++++++------- 2 files changed, 23 insertions(+), 12 deletions(-) diff --git a/modules/programs/direnv.nix b/modules/programs/direnv.nix index bfac53334..e4c17239c 100644 --- a/modules/programs/direnv.nix +++ b/modules/programs/direnv.nix @@ -6,11 +6,17 @@ let cfg = config.programs.direnv; configFile = config: - pkgs.runCommand "config.toml" { buildInputs = [ pkgs.remarshal ]; } '' - remarshal -if json -of toml \ - < ${pkgs.writeText "config.json" (builtins.toJSON config)} \ - > $out - ''; + pkgs.runCommand "config.toml" + { + buildInputs = [ pkgs.remarshal ]; + preferLocalBuild = true; + allowSubstitutes = false; + } + '' + remarshal -if json -of toml \ + < ${pkgs.writeText "config.json" (builtins.toJSON config)} \ + > $out + ''; in diff --git a/modules/programs/obs-studio.nix b/modules/programs/obs-studio.nix index 9f9310c95..f0dfecb63 100644 --- a/modules/programs/obs-studio.nix +++ b/modules/programs/obs-studio.nix @@ -12,13 +12,18 @@ let pluginDirs = map (pkg: "${pkg}/share/obs/obs-plugins") packages; plugins = concatMapStringsSep " " (p: "${p}/*") pluginDirs; in - pkgs.runCommand "obs-studio-plugins" {} '' - mkdir $out - [[ '${plugins}' ]] || exit 0 - for plugin in ${plugins}; do - ln -s "$plugin" $out/ - done - ''; + pkgs.runCommand "obs-studio-plugins" + { + preferLocalBuild = true; + allowSubstitutes = false; + } + '' + mkdir $out + [[ '${plugins}' ]] || exit 0 + for plugin in ${plugins}; do + ln -s "$plugin" $out/ + done + ''; in