diff options
Diffstat (limited to 'org')
| -rw-r--r-- | org/dlang-nix-flakes.org | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/org/dlang-nix-flakes.org b/org/dlang-nix-flakes.org index 85a207c..e3a01ed 100644 --- a/org/dlang-nix-flakes.org +++ b/org/dlang-nix-flakes.org @@ -477,7 +477,8 @@ use flake . ]; #inherit shellHook; }; - default = import ./shell.nix {inherit pkgs-nix;}; + default = self.devShells.${system}.dsh-overlay-ldc; + #default = import ./shell.nix {inherit pkgs-nix;}; }); }; } @@ -490,8 +491,17 @@ use flake . #+HEADER: :shebang "#!/usr/bin/env -S nix-shell --pure\n#!nix-shell -i bash" #+BEGIN_SRC nix {pkgs-nix ? import <nixpkgs> {}}: +let + ldc = pkgs-nix.callPackage ./nix-overlays/ldc {}; # -> <<ldc_version>> + # dmd overlay reverts to gcc14Stdenv; gcc15 introduced nullptr in its headers + # and DMD's ImportC parser needs update to handle it. Monitor and update. + dmd = pkgs-nix.callPackage ./nix-overlays/dmd { stdenv = pkgs-nix.gcc14Stdenv; }; # -> <<dmd_version>> + dub = pkgs-nix.callPackage ./nix-overlays/dub { inherit ldc; }; # -> <<dub_version>> + dtools = pkgs-nix.callPackage ./nix-overlays/dtools { inherit ldc; }; # -> <<dtools_version>>' +in with pkgs-nix; mkShell { + name = "overlay_ldc-<<ldc_version>>_dub-<<dub_version>>_dtools-<<dtools_version>>"; buildInputs = [ # ❯❯❯ nix_related #nix @@ -508,12 +518,11 @@ with pkgs-nix; # ❯❯❯ dev gnumake ps - # ❯❯❯ d_build_related # ❯❯ package manager - #dub + dub # ❯❯ compiler #dmd - #ldc + ldc #rund # ❯❯ linker #lld @@ -522,8 +531,7 @@ with pkgs-nix; #ninja #meson # ❯❯ tools - #dub - #dtools + dtools # ❯❯❯ test #tilix #gtkd |