diff --git a/pkgs/by-name/wi/wild-unwrapped/adapterTest.nix b/pkgs/by-name/wi/wild-unwrapped/adapterTest.nix index aaa578b97857..74b61d82632e 100644 --- a/pkgs/by-name/wi/wild-unwrapped/adapterTest.nix +++ b/pkgs/by-name/wi/wild-unwrapped/adapterTest.nix @@ -14,6 +14,7 @@ clang-tools, useWildLinker, hello, + taplo, }: let # These wrappers are REQUIRED for the Wild test suite to pass @@ -103,6 +104,10 @@ in stdenv.cc.libc.static ]; + nativeCheckInputs = [ + taplo + ]; + # https://github.com/davidlattimore/wild/discussions/832#discussioncomment-14482948 checkFlags = lib.optionals stdenv.hostPlatform.isAarch64 [ "--skip=integration_test::program_name_71___unresolved_symbols_object_c__" diff --git a/pkgs/by-name/wi/wild-unwrapped/package.nix b/pkgs/by-name/wi/wild-unwrapped/package.nix index acd36edcea45..6a83893c4a32 100644 --- a/pkgs/by-name/wi/wild-unwrapped/package.nix +++ b/pkgs/by-name/wi/wild-unwrapped/package.nix @@ -1,5 +1,6 @@ { lib, + stdenv, fetchFromGitHub, callPackage, versionCheckHook, @@ -10,20 +11,24 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "wild-unwrapped"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { - owner = "davidlattimore"; + owner = "wild-linker"; repo = "wild"; tag = finalAttrs.version; - hash = "sha256-E5cmZuOtF+MNTPyalKjnguhin70zqtDDB0D71ZpeE48="; + hash = "sha256-v4lPgZDPvRTAekkU9Vku9llgpOsaVtKt91VFUGrEeKw="; }; - cargoHash = "sha256-r0r7sN1SW5TIybHORfzJkN51Y0REEC2/h7q71GxUgAM="; + __structuredAttrs = true; - cargoBuildFlags = [ "-p wild-linker" ]; + cargoHash = "sha256-ADJLtTRXcVWcbvgwXvCs0wxcGp2XP1LZJUJ4hpuzVHQ="; + + cargoBuildFlags = [ + "-p" + "wild-linker" + ]; - strictDeps = true; nativeBuildInputs = [ pkg-config ]; @@ -46,14 +51,16 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Very fast linker for Linux"; - homepage = "https://github.com/davidlattimore/wild"; - changelog = "https://github.com/davidlattimore/wild/blob/${finalAttrs.version}/CHANGELOG.md"; + homepage = "https://github.com/wild-linker/wild"; + changelog = "https://github.com/wild-linker/wild/blob/${finalAttrs.version}/CHANGELOG.md"; license = [ lib.licenses.asl20 # or lib.licenses.mit ]; mainProgram = "wild"; maintainers = with lib.maintainers; [ RossSmyth ]; - platforms = lib.platforms.linux; + # Wild can run on Linux and Darwin, but can only target ELF platforms. + # On linux this is native, on Darwin this is cross (or emulated) + platforms = with lib.platforms; lib.optionals (stdenv.targetPlatform.isElf) (linux ++ darwin); }; })