Fix linux syscall library build for NixOS

ehmry · Jun 19, 2019 · 11d2a29 · 11d2a29
1 parent 4c4cc5b
commit 11d2a29
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/repos/base-linux/lib/import/import-lx_hybrid.mk b/repos/base-linux/lib/import/import-lx_hybrid.mk
@@ -26,7 +26,7 @@ HOST_INC_DIR += $(shell echo "int main() {return 0;}" |\
 # Nix include paths
 #
 ifneq ($(nativeBuildInputs),)
-HOST_INC_DIR += $(shell find  $(nativeBuildInputs) -name include)
+HOST_INC_DIR += $(shell find  $(nativeBuildInputs) -maxdepth 1 -name include)
 endif
 
 

diff --git a/repos/base-linux/lib/import/import-syscall-linux.mk b/repos/base-linux/lib/import/import-syscall-linux.mk
@@ -11,8 +11,12 @@ HOST_INC_DIR += /usr/include/$(shell gcc -dumpmachine)
 HOST_INC_DIR += /usr/include/i386-linux-gnu
 HOST_INC_DIR += /usr/include/x86_64-linux-gnu
 
-# NixOS
-HOST_INC_DIR += $(foreach NP,$(NIX_PROFILES),$(NP)/include)
+#
+# Nix include paths
+#
+ifneq ($(nativeBuildInputs),)
+HOST_INC_DIR += $(shell find  $(nativeBuildInputs) -maxdepth 1 -name include)
+endif
 
 #
 # Some header files installed on GNU/Linux test for the GNU compiler. For

diff --git a/tool/dev-shell.nix b/tool/dev-shell.nix
@@ -1,9 +1,10 @@
 { pkgs ? import <nixpkgs> {} }: with pkgs;
 
-stdenv.mkDerivation {
+pkgs.mkShell {
   name = "genode-dev-env";
-  buildInputs =
+  nativeBuildInputs =
     [ (import ./toolchain.nix { inherit pkgs; })
+      stdenv.glibc.dev
       git
       ccache
       tcl
@@ -33,7 +34,6 @@ stdenv.mkDerivation {
       SDL.dev
       alsaLib.dev
 
-
       # ncurses port needs infocmp
       ncurses
     ];
@@ -44,4 +44,5 @@ stdenv.mkDerivation {
       export PS1="\[\033[1;30m\]Genode-dev [\[\033[1;37m\]\w\[\033[1;30m\]] $\[\033[0m\] "
       export PS2="\[\033[1;30m\]>\[\033[0m\] "
     '';
+      # Setup a prompt with a distinct appearance
 }