Use a recent Nixpkgs release and fix the Nix build
This commit is contained in:
parent
e1812eb7ce
commit
987c561b0c
|
@ -1,10 +1,10 @@
|
||||||
let
|
let
|
||||||
pkgs = import (builtins.fetchGit {
|
pkgs = import (fetchTarball {
|
||||||
url = git://github.com/NixOS/nixpkgs;
|
url = https://github.com/NixOS/nixpkgs/archive/642499faefb17c3d36e074cf35b189f75ba43ee2.tar.gz;
|
||||||
rev = "8c6f9223d02c5123cbd364d6d56caca3c81416f0";
|
sha256 = "16j7gl3gg839fy54z5v4aap8lgf1ffih5swmfk62zskk30nwzfbi";
|
||||||
}) {};
|
}) {};
|
||||||
|
|
||||||
in
|
in
|
||||||
|
|
||||||
import ./nimbus.nix { inherit pkgs; }
|
import ./nix/nimbus.nix { inherit pkgs; }
|
||||||
|
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -42,11 +42,13 @@ stdenv.mkDerivation rec {
|
||||||
openssl pcre readline sqlite git
|
openssl pcre readline sqlite git
|
||||||
];
|
];
|
||||||
|
|
||||||
buildPhase = ''
|
buildPhase =
|
||||||
export HOME=$TMP
|
let caBundle = ./ca-bundle.pem;
|
||||||
export GIT_SSL_CAINFO=/etc/ssl/certs/ca-certificates.crt
|
in ''
|
||||||
sh build_all.sh
|
export HOME=$TMP
|
||||||
'';
|
export GIT_SSL_CAINFO=${caBundle}
|
||||||
|
sh build_all.sh
|
||||||
|
'';
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
install -Dt $out/bin bin/* koch
|
install -Dt $out/bin bin/* koch
|
Loading…
Reference in New Issue