Unverified Commit d62d9908 authored by John Ericson's avatar John Ericson Committed by GitHub
Browse files

wild: make wrapped default, add wild-unwrapped (#460568)

parents 73eeb857 f7f415d0

pkgs/by-name/wi/wild/adapterTest.nix→pkgs/by-name/wi/wild-unwrapped/adapterTest.nix

+2 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
  runCommandCC,

  makeBinaryWrapper,

  gcc,

  wild,

  wild-unwrapped,

  binutils-unwrapped-all-targets,

  clang,

  lld,
@@ -91,7 +91,7 @@ let 
    '';

in

{

  testWild = wild.overrideAttrs {

  testWild = wild-unwrapped.overrideAttrs {

    pname = "wild-tests";

    doCheck = true;

    doInstallCheck = false;

pkgs/by-name/wi/wild/package.nix→pkgs/by-name/wi/wild-unwrapped/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
  nix-update-script,

}:

rustPlatform.buildRustPackage (finalAttrs: {

  pname = "wild";

  pname = "wild-unwrapped";

  version = "0.7.0";



  src = fetchFromGitHub {
@@ -42,7 +42,7 @@ rustPlatform.buildRustPackage (finalAttrs: { 
  passthru = {

    updateScript = nix-update-script { };



    tests = callPackage ./adapterTest.nix { wild = finalAttrs.finalPackage; };

    tests = callPackage ./adapterTest.nix { wild-unwrapped = finalAttrs.finalPackage; };

  };



  meta = {

pkgs/stdenv/adapters.nix

+1 −1
Original line number Diff line number Diff line
@@ -345,7 +345,7 @@ rec { 
        cc = prev.cc.override {

          bintools = prev.cc.bintools.override {

            extraBuildCommands = ''

              ln -fs ${pkgs.buildPackages.wild-wrapped}/bin/* "$out/bin"

              ln -fs ${pkgs.buildPackages.wild}/bin/* "$out/bin"

            '';

          };

        };

pkgs/top-level/all-packages.nix

+6 −6
Original line number Diff line number Diff line
@@ -6805,17 +6805,17 @@ with pkgs; 


  vcpkg-tool-unwrapped = vcpkg-tool.override { doWrap = false; };



  wild-wrapped =

  wild =

    let

      ldWrapper = ../build-support/bintools-wrapper/ld-wrapper.sh;

    in

    wrapBintoolsWith {

      bintools = wild;

      bintools = wild-unwrapped;

      extraBuildCommands = ''

        wrap wild ${ldWrapper} ${lib.getExe buildPackages.wild}

        wrap ld.wild ${ldWrapper} ${lib.getExe buildPackages.wild}

        wrap ${stdenv.cc.bintools.targetPrefix}ld.wild ${ldWrapper} ${lib.getExe buildPackages.wild}

        wrap ${stdenv.cc.bintools.targetPrefix}ld ${ldWrapper} ${lib.getExe buildPackages.wild}

        wrap wild ${ldWrapper} ${lib.getExe buildPackages.wild-unwrapped}

        wrap ld.wild ${ldWrapper} ${lib.getExe buildPackages.wild-unwrapped}

        wrap ${stdenv.cc.bintools.targetPrefix}ld.wild ${ldWrapper} ${lib.getExe buildPackages.wild-unwrapped}

        wrap ${stdenv.cc.bintools.targetPrefix}ld ${ldWrapper} ${lib.getExe buildPackages.wild-unwrapped}

      '';

    };