Merge pull request #230827 from amjoseph-nixpkgs/zhf/dmd

dmd: build using gcc11Stdenv
NixOS · May 10, 2023 · b53b2f2 · b53b2f2
2 parents 8ab3c70 + 38a03e1
commit b53b2f2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/pkgs/development/compilers/dmd/binary.nix b/pkgs/development/compilers/dmd/binary.nix
@@ -28,6 +28,7 @@ in stdenv.mkDerivation {
     tzdata
   ] ++ lib.optionals hostPlatform.isLinux [
     glibc
+    stdenv.cc.cc.libgcc
   ];
 
   installPhase = ''

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -6838,9 +6838,12 @@ with pkgs;
 
   dleyna-server = callPackage ../development/libraries/dleyna-server { };
 
-  dmd = callPackage ../development/compilers/dmd {
+  dmd = callPackage ../development/compilers/dmd ({
     inherit (darwin.apple_sdk.frameworks) Foundation;
-  };
+  } // lib.optionalAttrs stdenv.isLinux {
+    # https://github.com/NixOS/nixpkgs/pull/206907#issuecomment-1527034123
+    stdenv = gcc11Stdenv;
+  });
 
   dmg2img = callPackage ../tools/misc/dmg2img { };
-Original file line number
+Diff line change
@@ Expand Up / @@ -28,6 +28,7 @@ in stdenv.mkDerivation { @@
         tzdata
       ] ++ lib.optionals hostPlatform.isLinux [
         glibc
+        stdenv.cc.cc.libgcc
       ];
       installPhase = ''
@@ Expand Down @@