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

Merge branch 'nix' into 'master'

Browse source 
Fix PREFIX_BINARY for NixOS users

See merge request redox-os/redox!1216
This commit is contained in:
Jeremy Soller 2019-06-11 20:13:13 +00:00
commit f89bfe70e4
2 changed files with 28 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
mk/prefix.mk
View file

@ -92,6 +92,8 @@ $(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" "$@"

32
shell.nix
View file

@ -1,9 +1,29 @@
with import <nixpkgs> {}; let
stdenv.mkDerivation { pkgs = import <nixpkgs> {
name = "redox"; overlays = [
(import (builtins.fetchTarball https://github.com/mozilla/nixpkgs-mozilla/archive/master.tar.gz))
];
};
rust = (pkgs.rustChannelOf {
date = "2019-04-06";
channel = "nightly";
}).rust;
in pkgs.mkShell rec {
hardeningDisable = [ "all" ]; hardeningDisable = [ "all" ];
nativeBuildInputs = [ gnumake cmake nasm pkgconfig gcc automake autoconf bison gperf qemu ]; # used in mk/prefix.mk to patch interpreter when PREFIX_BINARY=1
buildInputs = [ openssl gettext libtool flex libpng perl perlPackages.HTMLParser ]; 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 rust ];
buildInputs = with pkgs; [ fuse openssl gettext libtool flex libpng perl perlPackages.HTMLParser ];
shellHook = ''
export PATH="/run/wrappers/bin:$PATH"
'';
} }