diff options
Diffstat (limited to 'org/config_nix.org')
| -rw-r--r-- | org/config_nix.org | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/org/config_nix.org b/org/config_nix.org index 7d1f6a7..eba0917 100644 --- a/org/config_nix.org +++ b/org/config_nix.org @@ -35,10 +35,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 <<ldc_version>> - dmd = prev.callPackage ./nix-overlays/dmd { }; # -> ok <<dmd_version>> - dub = prev.callPackage ./nix-overlays/dub { }; # -> ? <<dub_version>> - dtools = prev.callPackage ./nix-overlays/dtools { }; # -> ok <<dtools_version>> + ldc = prev.callPackage ./nix-overlays/ldc { }; # -> ok <<ldc_version>> + # 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 <<dmd_version>> + dub = prev.callPackage ./nix-overlays/dub { }; # -> ? <<dub_version>> + dtools = prev.callPackage ./nix-overlays/dtools { }; # -> ok <<dtools_version>> #gdc = prev.callPackage ./nix-overlays/gdc { }; }); pkgsForSystem = system: import nixpkgs { @@ -120,7 +121,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"; }; @@ -169,7 +172,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; |