@@ -11,20 +11,20 @@ let
1111 name = "cbqn-bytecode-files";
1212 owner = "dzaima";
1313 repo = "CBQN";
14− rev = "94bb312d20919f942eabed3dca33c514de3c3227";
15− hash = "sha256-aFw5/F7/sYkYmxAnGeK8EwkoVrbEcjuJAD9YT+iW9Rw=";
14+ rev = "4d23479cdbd5ac6eb512c376ade58077b814b2b7";
15+ sha256 = "1il6pxbllf4rs0wf2s6q6h72m3p1d6ymgsllpkmadnw1agif0fri";
1616 };
1717in
1818assert genBytecode -> ((bqn-path != null) && (mbqn-source != null));
1919stdenv.mkDerivation rec {
2020 pname = "cbqn" + lib.optionalString (!genBytecode) "-standalone";
21− version = "0.0.0+unstable=2021-10-01";
21+ version = "0.0.0+unstable=2021-10-05";
2222
2323 src = fetchFromGitHub {
2424 owner = "dzaima";
2525 repo = "CBQN";
26− rev = "3725bd58c758a749653080319766a33169551536";
27− hash = "sha256-xWp64inFZRqGGTrH6Hqbj7aA0vYPyd+FdetowTMTjPs=";
26+ rev = "e23dab20daff9c0dacc2561c616174af72029a3e";
27+ sha256 = "17h8fb9a0hjindbxgkljajl1hjr8rdqrb85s5lz903v17wl4lrba";
2828 };
2929
3030 dontConfigure = true;
@@ -34,6 +34,9 @@ stdenv.mkDerivation rec {
3434 '';
3535
3636 preBuild = ''
37+ # otherwise cbqn defaults to clang
38+ makeFlagsArray+=("CC=$CC")
39+
3740 # inform make we are providing the runtime ourselves
3841 touch src/gen/customRuntime
3942 '' + (if genBytecode then ''
@@ -42,10 +45,6 @@ stdenv.mkDerivation rec {
4245 cp ${cbqn-bytecode-files}/src/gen/{compiler,formatter,runtime0,runtime1,src} src/gen/
4346 '');
4447
45− makeFlags = [
46− "CC=${stdenv.cc.targetPrefix}cc"
47− ];
48−
4948 installPhase = ''
5049 runHook preInstall
5150