about summary refs log tree commit diff
path: root/src/libstore/crypto.cc
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2017-04-13T14·15+0200
committerEelco Dolstra <edolstra@gmail.com>2017-04-13T14·15+0200
commit1860070548db119fc5f958febff3a087f21d5c83 (patch)
treefc0607c8c3536ea5c35d58bfc4489374a1439ad7 /src/libstore/crypto.cc
parent2040240e238a41c2eb799bf4dbf394fec297ac16 (diff)
parente7cb2847ab1cec48eac6a86c56885b3f0df76275 (diff)
Merge branch 'rework-options' of https://github.com/copumpkin/nix
Diffstat (limited to 'src/libstore/crypto.cc')
-rw-r--r--src/libstore/crypto.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/libstore/crypto.cc b/src/libstore/crypto.cc
index 0fc86a1fe921..9692dd83b4ea 100644
--- a/src/libstore/crypto.cc
+++ b/src/libstore/crypto.cc
@@ -105,14 +105,12 @@ PublicKeys getDefaultPublicKeys()
 
     // FIXME: filter duplicates
 
-    for (auto s : settings.get("binary-cache-public-keys",
-            Strings{"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="}))
-    {
+    for (auto s : settings.binaryCachePublicKeys) {
         PublicKey key(s);
         publicKeys.emplace(key.name, key);
     }
 
-    for (auto secretKeyFile : settings.get("secret-key-files", Strings())) {
+    for (auto secretKeyFile : settings.secretKeyFiles) {
         try {
             SecretKey secretKey(readFile(secretKeyFile));
             publicKeys.emplace(secretKey.name, secretKey.toPublicKey());