Skip to content

Commit a6ed7e0

Browse files
committed
(Partially) refactor Nix shell configuration for new Codename setup
Codename now introduces the usage of Haxe 4.3.7 as the recommended Haxe version, and moves a few files around, including the library installation scripts. The Nix shell configuration has been updated to accomodate for this. Do note that this is an incomplete refactor, and is used for issue reproduction as well. See CodenameCrew#769 for more information.
1 parent 2b77d28 commit a6ed7e0

File tree

1 file changed

+27
-6
lines changed

1 file changed

+27
-6
lines changed

shell.nix

Lines changed: 27 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,27 @@
1-
{ }:
1+
{
2+
pkgs ? import <nixpkgs> {
3+
overlays = [
4+
(final: prev: {
5+
# Haxe does not compile properly using the overlay
6+
# below, due to an OCaml error. Do note that the patches
7+
# have been removed as a result of an outdated patch.
8+
#
9+
# haxe = prev.haxe.overrideAttrs (old: {
10+
# version = "4.3.7";
11+
# src = prev.fetchgit {
12+
# url = "https://github.com/HaxeFoundation/haxe.git";
13+
# tag = "4.3.7";
14+
# hash = "sha256-sQb7MCoH2dZOvNmDQ9P0yFYrSXYOMn4FS/jlyjth39Y=";
15+
# fetchSubmodules = true;
16+
# };
17+
# patches = [ ];
18+
# });
19+
})
20+
];
21+
config = { };
22+
},
23+
}:
224
let
3-
pkgs = import (builtins.fetchTarball {
4-
url = "https://github.com/NixOS/nixpkgs/archive/c407032be28ca2236f45c49cfb2b8b3885294f7f.tar.gz";
5-
}) { };
6-
725
libs =
826
with pkgs;
927
[
@@ -37,6 +55,9 @@ pkgs.mkShell {
3755
LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath libs;
3856

3957
shellHook = ''
40-
source update.sh
58+
cd building/
59+
# The shell script does not work properly with
60+
# Nix shells!
61+
# source setup-unix.sh
4162
'';
4263
}

0 commit comments

Comments
 (0)