gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wild: make wrapped default, add wild-unwrapped

Browse Source
This commit is contained in:
Dawid Ciężarkiewicz
2025-11-10 22:03:11 -08:00
parent f5534781ba
commit f7f415d099
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/by-name/wi/wild/adapterTest.nix → pkgs/by-name/wi/wild-unwrapped/adapterTest.nix
+2 -2
View File
@@ -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
View File
@@ -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
View File
@@ -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
View File
@@ -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}
'';
};