about summary refs log tree commit diff
path: root/nixpkgs/nixos/modules/services/databases
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2019-02-26 23:32:33 +0000
committerAlyssa Ross <hi@alyssa.is>2019-02-26 23:32:33 +0000
commit1bf6dffc1145dcf54c2b60d8a72cd384de0ef0b5 (patch)
treecba73be7e3108dca51f75c9ec44a8bd61246b11a /nixpkgs/nixos/modules/services/databases
parentdb8291322dd83add2250dd4480b46298655cbfba (diff)
parent1233c8d9e9bc463899ed6a8cf0232e6bf36475ee (diff)
downloadnixlib-1bf6dffc1145dcf54c2b60d8a72cd384de0ef0b5.tar
nixlib-1bf6dffc1145dcf54c2b60d8a72cd384de0ef0b5.tar.gz
nixlib-1bf6dffc1145dcf54c2b60d8a72cd384de0ef0b5.tar.bz2
nixlib-1bf6dffc1145dcf54c2b60d8a72cd384de0ef0b5.tar.lz
nixlib-1bf6dffc1145dcf54c2b60d8a72cd384de0ef0b5.tar.xz
nixlib-1bf6dffc1145dcf54c2b60d8a72cd384de0ef0b5.tar.zst
nixlib-1bf6dffc1145dcf54c2b60d8a72cd384de0ef0b5.zip
Merge commit '1233c8d9e9bc463899ed6a8cf0232e6bf36475ee'
Diffstat (limited to 'nixpkgs/nixos/modules/services/databases')
-rw-r--r--nixpkgs/nixos/modules/services/databases/hbase.nix2
-rw-r--r--nixpkgs/nixos/modules/services/databases/influxdb.nix1
2 files changed, 2 insertions, 1 deletions
diff --git a/nixpkgs/nixos/modules/services/databases/hbase.nix b/nixpkgs/nixos/modules/services/databases/hbase.nix
index 4772e897efe2..52f2d95b4e00 100644
--- a/nixpkgs/nixos/modules/services/databases/hbase.nix
+++ b/nixpkgs/nixos/modules/services/databases/hbase.nix
@@ -18,7 +18,7 @@ let
     </configuration>
   '';
 
-  configDir = pkgs.runCommand "hbase-config-dir" {} ''
+  configDir = pkgs.runCommand "hbase-config-dir" { preferLocalBuild = true; } ''
     mkdir -p $out
     cp ${cfg.package}/conf/* $out/
     rm $out/hbase-site.xml
diff --git a/nixpkgs/nixos/modules/services/databases/influxdb.nix b/nixpkgs/nixos/modules/services/databases/influxdb.nix
index d7a028b25d8d..888bf13c3df8 100644
--- a/nixpkgs/nixos/modules/services/databases/influxdb.nix
+++ b/nixpkgs/nixos/modules/services/databases/influxdb.nix
@@ -98,6 +98,7 @@ let
 
   configFile = pkgs.runCommand "config.toml" {
     buildInputs = [ pkgs.remarshal ];
+    preferLocalBuild = true;
   } ''
     remarshal -if json -of toml \
       < ${pkgs.writeText "config.json" (builtins.toJSON configOptions)} \