From 560c4c66a2272fc19eeb63a622a4b5aae717d283 Mon Sep 17 00:00:00 2001 From: Zahary Karadjov Date: Wed, 26 Sep 2018 12:34:24 +0300 Subject: [PATCH] Restore the Nix build --- nim.nix | 13 +++++++------ nimbus.nix | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/nim.nix b/nim.nix index 2c0b2159d..934629f9d 100644 --- a/nim.nix +++ b/nim.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, makeWrapper, nodejs, openssl, pcre, readline, sqlite, nim }: +{ stdenv, lib, makeWrapper, git, nodejs, openssl, pcre, readline, sqlite }: stdenv.mkDerivation rec { # This derivation may be a bit confusing at first, because it builds the Status' @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ref = "nimbus"; # Set this to the hash of the head commit in the nimbus branch: - rev = "d40fb5a6d3ed937d41fd0e72a27df8c397aae881"; + rev = "c240806756579c3375b1a79e1e65c40087a52ac5"; }; doCheck = true; @@ -38,13 +38,14 @@ stdenv.mkDerivation rec { # as part of building it, so it cannot be read-only buildInputs = [ - makeWrapper nodejs nim - openssl pcre readline sqlite + makeWrapper nodejs + openssl pcre readline sqlite git ]; buildPhase = '' - nim c --lib:"./lib" -d:release koch.nim - nim c --lib:"./lib" -d:release compiler/nim.nim && mv compiler/nim bin/ + export HOME=$TMP + export GIT_SSL_CAINFO=/etc/ssl/certs/ca-certificates.crt + sh build_all.sh ''; installPhase = '' diff --git a/nimbus.nix b/nimbus.nix index 1d7f7ffff..3bfcf7017 100644 --- a/nimbus.nix +++ b/nimbus.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }; src = ./.; - buildInputs = [pkgs.clang nim pkgs.rocksdb_lite]; + buildInputs = [pkgs.clang nim pkgs.rocksdb pkgs.sqlite]; LD_LIBRARY_PATH = "${makeLibraryPath buildInputs}"; }