@@ -19,13 +19,13 @@ assert genBytecode -> ((bqn-path != null) && (mbqn-source != null));
1919
2020stdenv.mkDerivation rec {
2121 pname = "cbqn" + lib.optionalString (!genBytecode) "-standalone";
22− version = "0.pre+unstable=2021-10-05";
22+ version = "0.pre+unstable=2021-10-09";
2323
2424 src = fetchFromGitHub {
2525 owner = "dzaima";
2626 repo = "CBQN";
27− rev = "e23dab20daff9c0dacc2561c616174af72029a3e";
28− hash = "sha256-amVKKD9hD5A+LbqglXHLKEsYqFSSztdXs1FCoNJyCJ4=";
27+ rev = "debc4e2afe313a3c54133df9f26969c2927dc8aa";
28+ hash = "sha256-ixFDmtq6hd2enmPbBT0JCv1bmxt84zle4zPQzz+rMCI=";
2929 };
3030
3131 dontConfigure = true;
@@ -34,11 +34,12 @@ stdenv.mkDerivation rec {
3434 sed -i '/SHELL =.*/ d' makefile
3535 '';
3636
37− preBuild = ''
38− # otherwise cbqn defaults to clang
39− makeFlagsArray+=("CC=$CC")
37+ makeFlags = [
38+ "CC=${stdenv.cc.targetPrefix}cc"
39+ ];
4040
41− # inform make we are providing the runtime ourselves
41+ preBuild = ''
42+ # Purity: avoids git downloading bytecode files
4243 touch src/gen/customRuntime
4344 '' + (if genBytecode then ''
4445 ${bqn-path} genRuntime ${mbqn-source}