diff options
| author | Arseniy Seroka <jagajaga@users.noreply.github.com> | 2015-04-15 22:57:59 +0300 |
|---|---|---|
| committer | Arseniy Seroka <jagajaga@users.noreply.github.com> | 2015-04-15 22:57:59 +0300 |
| commit | 7bc23e994c958100ab0390e40c97f6a53fbf5ab4 (patch) | |
| tree | eefa0cb2888a3eb7c7cb6c94eabac58d2e0e0361 /pkgs | |
| parent | e6591588a96e82b5cdb5372909dbb919d5a4ee7e (diff) | |
| parent | 4ef974a00d672a5b7d7215ef88c17ec70df9e128 (diff) | |
| download | nixpkgs-7bc23e994c958100ab0390e40c97f6a53fbf5ab4.tar nixpkgs-7bc23e994c958100ab0390e40c97f6a53fbf5ab4.tar.gz nixpkgs-7bc23e994c958100ab0390e40c97f6a53fbf5ab4.tar.bz2 nixpkgs-7bc23e994c958100ab0390e40c97f6a53fbf5ab4.tar.lz nixpkgs-7bc23e994c958100ab0390e40c97f6a53fbf5ab4.tar.xz nixpkgs-7bc23e994c958100ab0390e40c97f6a53fbf5ab4.tar.zst nixpkgs-7bc23e994c958100ab0390e40c97f6a53fbf5ab4.zip | |
Merge pull request #7191 from nmikhailov/keybase_fix
keybase-node: fix imports, reenable build
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/misc/keybase-node-client/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/misc/keybase-node-client/default.nix b/pkgs/applications/misc/keybase-node-client/default.nix index 048b42159b8..7f16b27c4bc 100644 --- a/pkgs/applications/misc/keybase-node-client/default.nix +++ b/pkgs/applications/misc/keybase-node-client/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; let - nodePackages = callPackage (import <nixpkgs/pkgs/top-level/node-packages.nix>) { + nodePackages = callPackage (import ../../../top-level/node-packages.nix) { neededNatives = [] ++ optional (stdenv.isLinux) utillinux; self = nodePackages; generated = ./package.nix; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 94b6d67908b..a07b04d165a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1753,7 +1753,7 @@ let kexectools = callPackage ../os-specific/linux/kexectools { }; - #keybase-node-client = callPackage ../applications/misc/keybase-node-client { }; + keybase-node-client = callPackage ../applications/misc/keybase-node-client { }; keychain = callPackage ../tools/misc/keychain { }; |