diff options
| author | Ralph Amissah <ralph.amissah@gmail.com> | 2026-04-09 09:17:45 -0400 |
|---|---|---|
| committer | Ralph Amissah <ralph.amissah@gmail.com> | 2026-04-09 09:24:53 -0400 |
| commit | f125c5892ce48c60af00dc3114bf2aa8c2014a89 (patch) | |
| tree | 070ce7eb8b465b8be4dc98d8d9301818a33e8d71 /flake.nix | |
| parent | nix cleanup flake.nix and shell.nix (diff) | |
flake.nix dmd build fix overlay: revert to GCC14
- revert to using GCC14: (current) GCC 15
introduced nullptr in its headers, and DMD's
ImportC parser needs update to handle it,
monitor and update
- (nix ldc overlay, minor comsetic)
Diffstat (limited to 'flake.nix')
| -rw-r--r-- | flake.nix | 17 |
1 files changed, 11 insertions, 6 deletions
@@ -12,10 +12,11 @@ forAllSystems = nixpkgs.lib.genAttrs supportedSystems; nixpkgsFor = forAllSystems (system: import nixpkgs {inherit system;}); # nixpkgs instantiated for supported system types localOverlay = (final: prev: { - ldc = prev.callPackage ./nix-overlays/ldc { }; # -> ok 1.42.0 - dmd = prev.callPackage ./nix-overlays/dmd { }; # -> ok 2.111.0 - dub = prev.callPackage ./nix-overlays/dub { }; # -> ? 1.40.0 - dtools = prev.callPackage ./nix-overlays/dtools { }; # -> ok 2.110.0 + ldc = prev.callPackage ./nix-overlays/ldc { }; # -> ok 1.42.0 + # dmd overlay: revert to GCC14; (current) GCC 15 introduced nullptr in its headers, and DMD's ImportC parser needs update to handle it, monitor and update: + dmd = prev.callPackage ./nix-overlays/dmd { stdenv = prev.gcc14Stdenv; }; # -> ok 2.111.0 + dub = prev.callPackage ./nix-overlays/dub { }; # -> ? 1.40.0 + dtools = prev.callPackage ./nix-overlays/dtools { }; # -> ok 2.110.0 #gdc = prev.callPackage ./nix-overlays/gdc { }; }); pkgsForSystem = system: import nixpkgs { @@ -97,7 +98,9 @@ default = self.packages.${system}.spine-nixpkgs-ldc; spine-nixpkgs-dmd = mkSpine { pkgs = pkgs-nix; - compilerPkg = pkgs-nix.dmd; + # nixpkgs dmd: revert to GCC14 (same nullptr/ImportC fix as overlay dmd) + compilerPkg = pkgs-nix.dmd.override { stdenv = pkgs-nix.gcc14Stdenv; }; + #compilerPkg = pkgs-nix.dmd; compilerBin = "dmd"; buildType = "dmd"; }; @@ -146,7 +149,9 @@ dsh-nixpkgs-dmd = mkDevShell { pkgs = pkgs-nix; name = "spine-${version} dev shell (nixpkgs dmd)"; - compiler = pkgs-nix.dmd; + # nixpkgs dmd: revert to GCC14 (same nullptr/ImportC fix as overlay dmd) + compiler = pkgs-nix.dmd.override { stdenv = pkgs-nix.gcc14Stdenv; }; + #compiler = pkgs-nix.dmd; }; dsh-nixpkgs-ldc = mkDevShell { pkgs = pkgs-nix; |