Unverified Commit b53b2f23 authored by Adam Joseph's avatar Adam Joseph Committed by GitHub
Browse files

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

dmd: build using gcc11Stdenv
parents 8ab3c703 38a03e16
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ in stdenv.mkDerivation {
    tzdata
  ] ++ lib.optionals hostPlatform.isLinux [
    glibc
    stdenv.cc.cc.libgcc
  ];

  installPhase = ''
+5 −2
Original line number Diff line number Diff line
@@ -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 { };