summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2016-10-20 09:11:51 +0200
committerlassulus <lass@aidsballs.de>2016-10-20 09:11:51 +0200
commit67a61b71fc04612ea9d8933752d6e0b6f2d81e0e (patch)
treef4e9cef5f510fb37e1802037d9cbbb94c5ead5e3
parent3db3f9df43b827d8bd73413df3357760f33c7ab1 (diff)
parent789dbe2b2657760a5cebcf320f6807847d4fba64 (diff)
Merge remote-tracking branch 'gum/master'
-rw-r--r--krebs/5pkgs/go/default.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/krebs/5pkgs/go/default.nix b/krebs/5pkgs/go/default.nix
index fb8b65ea1..2871e5a99 100644
--- a/krebs/5pkgs/go/default.nix
+++ b/krebs/5pkgs/go/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, makeWrapper, lib, buildEnv, fetchgit, nodePackages, nodejs }:
+{ stdenv, makeWrapper, callPackage, lib, buildEnv, fetchgit, nodePackages, nodejs }:
with lib;
let
- np = nodePackages.override {
+ np = (callPackage <nixpkgs/pkgs/top-level/node-packages.nix>) {
generated = ./packages.nix;
self = np;
};
@@ -18,7 +18,7 @@ let
ignoreCollisions = true;
};
-in nodePackages.buildNodePackage {
+in np.buildNodePackage {
name = "go";
src = fetchgit {