diff options
author | Artturi <Artturin@artturin.com> | 2023-10-20 01:52:23 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-10-20 01:52:23 +0300 |
commit | 4b3606057e44ac9d715fdf972fcd846adb254255 (patch) | |
tree | 97248c096cf3668e9f43c6ab5d1da09c24d7da2d /pkgs/development | |
parent | bcdd2da2dc5f50b4f02b0d69bec2467bcfe47a19 (diff) | |
parent | 061c8d6d3ee66d63d19af5b4b9ba214c92a0cf0c (diff) |
Merge pull request #261856 from paveloom/mold
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/tools/mold/default.nix | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/development/tools/mold/default.nix b/pkgs/development/tools/mold/default.nix index 2cbc016a2933c..530fbb1666c78 100644 --- a/pkgs/development/tools/mold/default.nix +++ b/pkgs/development/tools/mold/default.nix @@ -11,6 +11,8 @@ , zstd , buildPackages +, clangStdenv +, gccStdenv , hello , mold , mold-wrapped @@ -21,13 +23,13 @@ stdenv.mkDerivation rec { pname = "mold"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "rui314"; repo = "mold"; rev = "v${version}"; - hash = "sha256-ePX80hzzIzSJdGUX96GyxYWcdbXxXyuyNQqj5RDSkKU="; + hash = "sha256-TgDGAYdJjqGQradB7UJlV2emvG7q4F9ctzPaGRUgvxU="; }; nativeBuildInputs = [ @@ -89,11 +91,13 @@ stdenv.mkDerivation rec { in { version = testers.testVersion { package = mold; }; + } // lib.optionalAttrs stdenv.isLinux { + adapter-gcc = helloTest "adapter-gcc" (hello.override (old: { stdenv = useMoldLinker gccStdenv; })); + adapter-llvm = helloTest "adapter-llvm" (hello.override (old: { stdenv = useMoldLinker clangStdenv; })); wrapped = helloTest "wrapped" (hello.overrideAttrs (previousAttrs: { nativeBuildInputs = (previousAttrs.nativeBuildInputs or [ ]) ++ [ mold-wrapped ]; NIX_CFLAGS_LINK = toString (previousAttrs.NIX_CFLAGS_LINK or "") + " -fuse-ld=mold"; })); - adapter = helloTest "adapter" (hello.override (old: { stdenv = useMoldLinker old.stdenv; })); }; }; |