diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2017-04-25T14·55+0200 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2017-04-25T14·55+0200 |
| commit | 2dff9556a4131af8a50647f23fe03bfc3c295e12 (patch) | |
| tree | b4e1a84bf9ba5037101a66e06c265f244ed4c201 | |
| parent | 0e49f941205769852846cb8afa228831cf6ae363 (diff) | |
Fix build
| -rw-r--r-- | default.nix | 8 | ||||
| -rw-r--r-- | nix-repl.cc | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/default.nix b/default.nix index 8690325e5289..919082981e1e 100644 --- a/default.nix +++ b/default.nix @@ -4,13 +4,13 @@ with import nixpkgs { inherit system; }; let nix = nixUnstable; in -runCommand "nix-repl" - { buildInputs = [ readline nix boehmgc ]; } +runCommandCC "nix-repl" + { buildInputs = [ pkgconfig readline nix boehmgc ]; } '' mkdir -p $out/bin - g++ -O3 -Wall -std=c++0x \ + g++ -O3 -Wall -std=c++14 \ -o $out/bin/nix-repl ${./nix-repl.cc} \ - -I${nix}/include/nix \ + $(pkg-config --cflags nix-main) \ -lnixformat -lnixutil -lnixstore -lnixexpr -lnixmain -lreadline -lgc \ -DNIX_VERSION=\"${(builtins.parseDrvName nix.name).version}\" '' diff --git a/nix-repl.cc b/nix-repl.cc index 0e8c67cf7f28..0c50f4683300 100644 --- a/nix-repl.cc +++ b/nix-repl.cc @@ -1,3 +1,5 @@ +#include <nix/config.h> + #include <iostream> #include <cstdlib> @@ -291,7 +293,7 @@ static int runProgram(const string & program, const Strings & args) _exit(1); } - return pid.wait(true); + return pid.wait(); } |