add back in dst

holochain · Sep 10, 2020 · 62c3554 · 62c3554
1 parent 8c3edb9
commit 62c3554
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/default.nix b/default.nix
@@ -20,12 +20,12 @@ let
  node = pkgs.callPackage ./node { };
  git = pkgs.callPackage ./git { };
  linux = pkgs.callPackage ./linux { };
- #dist = pkgs.callPackage ./dist {
- # rust = rust;
- # node = node;
- # git = git;
- # darwin = darwin;
- #};
+ dist = pkgs.callPackage ./dist {
+  rust = rust;
+  node = node;
+  git = git;
+  darwin = darwin;
+ };
  docs = pkgs.callPackage ./docs { };
  n3h = pkgs.callPackage ./n3h { };
  newrelic = pkgs.callPackage ./newrelic { };
@@ -42,7 +42,7 @@ let
   pkgs = pkgs;
   aws = aws;
   darwin = darwin;
-  #dist = dist;
+  dist = dist;
   docs = docs;
   git = git;
   linux = linux;
@@ -69,10 +69,10 @@ in
 
  # needed for nix-env to discover install attributes
  holochain = {
-  #hc = dist.cli.derivation;
-  #holochain = dist.holochain.derivation;
-  #sim2h_server = dist.sim2h_server.derivation;
-  #trycp_server = dist.trycp_server.derivation;
+  hc = dist.cli.derivation;
+  holochain = dist.holochain.derivation;
+  sim2h_server = dist.sim2h_server.derivation;
+  trycp_server = dist.trycp_server.derivation;
  };
 
  # expose other things

diff --git a/nix-shell/default.nix b/nix-shell/default.nix
@@ -2,7 +2,7 @@
  pkgs,
  aws,
  darwin,
- #dist,
+ dist,
  docs,
  git,
  linux,
@@ -95,7 +95,7 @@
  ++ (pkgs.callPackage ./flush { }).buildInputs
  ++ aws.buildInputs
  ++ darwin.buildInputs
- #++ dist.buildInputs
+ ++ dist.buildInputs
  ++ docs.buildInputs
  ++ git.buildInputs
  ++ linux.buildInputs