From 99d181f13d442253ed837a43dec8da6aa5b92237 Mon Sep 17 00:00:00 2001
From: jD91mZM2 <me@krake.one>
Date: Mon, 17 Jun 2019 15:22:00 +0200
Subject: [PATCH] Remove nix-related patches and files
Everything has now been moved to
https://gitlab.redox-os.org/redox-os/redox-nix :)
---
mk/prefix.mk | 2 --
shell.nix | 21 ---------------------
2 files changed, 23 deletions(-)
delete mode 100644 shell.nix
diff --git a/mk/prefix.mk b/mk/prefix.mk
index aeecbbf36..1427c6540 100644
--- a/mk/prefix.mk
+++ b/mk/prefix.mk
@@ -92,8 +92,6 @@ $(PREFIX)/gcc-install: $(PREFIX)/gcc-install.tar.gz
rm -rf "$@.partial" "$@"
mkdir -p "$@.partial"
tar --extract --file "$<" --directory "$@.partial" --strip-components=1
- [ -n "$$NIX_INTERPRETER" ] && find "$@.partial" -executable -type f -exec \
- patchelf --set-interpreter "$$NIX_INTERPRETER" "{}" \;
touch "$@.partial"
mv "$@.partial" "$@"
diff --git a/shell.nix b/shell.nix
deleted file mode 100644
index 1005d2eef..000000000
--- a/shell.nix
+++ /dev/null
@@ -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"
- '';
-}
--
GitLab