vinzenz/redox
0
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitlab.redox-os.org/redox-os/redox

Browse source
This commit is contained in:
Jeremy Soller 2019-06-17 17:23:04 -06:00
parent 5d5a3839a4 99d181f13d
commit b9dc4cb2b7
No known key found for this signature in database
GPG key ID: E988B49EE78A7FB1
2 changed files with 0 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mk/prefix.mk
View file

@ -92,8 +92,6 @@ $(PREFIX)/gcc-install: $(PREFIX)/gcc-install.tar.gz
rm -rf "$@.partial" "$@" rm -rf "$@.partial" "$@"
mkdir -p "$@.partial" mkdir -p "$@.partial"
tar --extract --file "$<" --directory "$@.partial" --strip-components=1 tar --extract --file "$<" --directory "$@.partial" --strip-components=1
[ -n "$$NIX_INTERPRETER" ] && find "$@.partial" -executable -type f -exec \
patchelf --set-interpreter "$$NIX_INTERPRETER" "{}" \;
touch "$@.partial" touch "$@.partial"
mv "$@.partial" "$@" mv "$@.partial" "$@"

21
shell.nix
View file

@ -1,21 +0,0 @@
{ pkgs ? import <nixpkgs> {} }:
pkgs.mkShell rec {
hardeningDisable = [ "all" ];
# used in mk/prefix.mk to patch interpreter when PREFIX_BINARY=1
NIX_INTERPRETER = "${pkgs.stdenv.cc.libc}/lib/ld-linux-x86-64.so.2";
LIBRARY_PATH = pkgs.lib.makeLibraryPath [
pkgs.gcc-unwrapped pkgs.stdenv.cc.libc
(toString prefix/x86_64-unknown-redox)
];
LD_LIBRARY_PATH = LIBRARY_PATH;
nativeBuildInputs = with pkgs; [ gnumake cmake nasm pkgconfig gcc automake autoconf bison gperf qemu rustup ];
buildInputs = with pkgs; [ fuse openssl gettext libtool flex libpng perl perlPackages.HTMLParser ];
shellHook = ''
export PATH="/run/wrappers/bin:$PATH"
'';
}