status-im
/
nimbus-eth1
mirror of https://github.com/status-im/nimbus-eth1.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix nimbus Nix build

This commit is contained in:
Pedro Pombeiro 2019-10-28 11:02:55 +01:00 committed by zah
parent 119a53d298
commit 89e67ca908
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
default.nix
View File

@ -52,9 +52,9 @@ let
mapAttrs = nixpkgs.lib.attrsets.mapAttrs; mapAttrs = nixpkgs.lib.attrsets.mapAttrs;
crossPackages = mapAttrs (target: conf: nixpkgsFn { crossSystem = conf; }) targets; crossPackages = mapAttrs (target: conf: nixpkgsFn { crossSystem = conf; }) targets;
crossBulds = mapAttrs (target: packages: nimbus packages) crossPackages; crossBuilds = mapAttrs (target: packages: nimbus packages) crossPackages;
in in
(nimbus nixpkgs) // crossBulds (nimbus nixpkgs) // crossBuilds

4
nix/nimbus.nix
View File

@ -1,4 +1,4 @@
{ stdenv, callPackage, sqlite, clang, rocksdb }: { stdenv, callPackage, sqlite, clang, pcre, rocksdb }:
let let
nim = callPackage ./nim.nix {}; nim = callPackage ./nim.nix {};
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
}; };
src = ./.; src = ./.;
buildInputs = [clang nim rocksdb sqlite]; buildInputs = [clang nim rocksdb pcre sqlite];
LD_LIBRARY_PATH = "${makeLibraryPath buildInputs}"; LD_LIBRARY_PATH = "${makeLibraryPath buildInputs}";
} }