Restore the Nix build

This commit is contained in:
Zahary Karadjov 2018-09-26 12:34:24 +03:00
parent 5c0fd16448
commit 560c4c66a2
2 changed files with 8 additions and 7 deletions

13
nim.nix
View File

@ -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 { stdenv.mkDerivation rec {
# This derivation may be a bit confusing at first, because it builds the Status' # This derivation may be a bit confusing at first, because it builds the Status'
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
ref = "nimbus"; ref = "nimbus";
# Set this to the hash of the head commit in the nimbus branch: # Set this to the hash of the head commit in the nimbus branch:
rev = "d40fb5a6d3ed937d41fd0e72a27df8c397aae881"; rev = "c240806756579c3375b1a79e1e65c40087a52ac5";
}; };
doCheck = true; doCheck = true;
@ -38,13 +38,14 @@ stdenv.mkDerivation rec {
# as part of building it, so it cannot be read-only # as part of building it, so it cannot be read-only
buildInputs = [ buildInputs = [
makeWrapper nodejs nim makeWrapper nodejs
openssl pcre readline sqlite openssl pcre readline sqlite git
]; ];
buildPhase = '' buildPhase = ''
nim c --lib:"./lib" -d:release koch.nim export HOME=$TMP
nim c --lib:"./lib" -d:release compiler/nim.nim && mv compiler/nim bin/ export GIT_SSL_CAINFO=/etc/ssl/certs/ca-certificates.crt
sh build_all.sh
''; '';
installPhase = '' installPhase = ''

View File

@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
}; };
src = ./.; src = ./.;
buildInputs = [pkgs.clang nim pkgs.rocksdb_lite]; buildInputs = [pkgs.clang nim pkgs.rocksdb pkgs.sqlite];
LD_LIBRARY_PATH = "${makeLibraryPath buildInputs}"; LD_LIBRARY_PATH = "${makeLibraryPath buildInputs}";
} }