From 794d821503b57c4e38d7b286afb8958cc61ae64d Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 25 Apr 2023 23:51:22 +0100 Subject: [PATCH 1/2] dmd: pull in missing libgcc.so dependency Without the change autopatchelf fails to find the dependency as: searching for dependencies of ...-dmd-bootstrap-2.090.1/bin/dmd libgcc_s.so.1 -> not found! auto-patchelf: 6 dependencies could not be satisfied Full build log: https://hydra.nixos.org/log/plma45m19p0cm1i04c4qzmfi54n38ydk-dmd-bootstrap-2.090.1.drv --- pkgs/development/compilers/dmd/binary.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/dmd/binary.nix b/pkgs/development/compilers/dmd/binary.nix index b7f7755d057e..6a99d42eff72 100644 --- 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 = '' From 38a03e164e87465e8ec5781960fab5d8eacb7bde Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Tue, 9 May 2023 00:31:06 -0700 Subject: [PATCH 2/2] dmd: build using gcc11Stdenv The DMD test suite has been failing since we updated to gcc12, as reported by @trofi: https://github.com/NixOS/nixpkgs/pull/206907#issuecomment-1527034123 Let's use gcc11Stdenv for now. --- pkgs/top-level/all-packages.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 58ea2ba96c7b..851101dee391 100644 --- 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 { };