Merge branch 'nix-fixes' into 'master'

nix: Fix stripping

See merge request redox-os/redox!2418
This commit is contained in:
Konstantin Shabanov 2026-11-02 07:31:03 +00:00
commit 08d692ae13

View File

@ -104,14 +104,13 @@
#TODO: This isn't tested yet, use at your own risk #TODO: This isn't tested yet, use at your own risk
native = (pkgs.mkShell.override { stdenv = pkgs.gcc14Stdenv; }) rec { native = (pkgs.mkShell.override { stdenv = pkgs.gcc14Stdenv; }) rec {
nativeBuildInputs = nativeBuildInputs =
let
autoreconf269 = pkgs.writeShellScriptBin "autoreconf2.69" "${pkgs.autoconf269}/bin/autoreconf";
in
with pkgs; with pkgs;
[ [
(pkgs.writeShellScriptBin "${pkgs.stdenv.hostPlatform.system}-gnu-strip" ''
${pkgs.bintools-unwrapped}/bin/strip $@
'')
ant ant
autoconf autoconf269
autoreconf269 # gnu-binutils
automake automake
bison bison
cmake cmake