From be676c173561907ba96a5cb1140da6383ac671f0 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Fri, 29 May 2020 09:05:54 +0530 Subject: [PATCH] WiP ncurses --- overlay/default.nix | 6 ++++++ overlay/ncurses/genode.patch | 12 ++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 overlay/ncurses/genode.patch diff --git a/overlay/default.nix b/overlay/default.nix index 9e8877e..abbd64b 100644 --- a/overlay/default.nix +++ b/overlay/default.nix @@ -77,6 +77,12 @@ in { targetLlvmLibraries = targetPackages.llvmPackages_8.libraries; }); + ncurses = overrideHostAttrs ncurses (attrs: { + nativeBuildInputs = [ buildPackages.breakpointHook ]; + patches = attrs.patches ++ [ ./ncurses/genode.patch ]; + configureFlags = attrs.configureFlags ++ [ "--without-cxx" ]; + }); + openssl = overrideHostAttrs openssl (attrs: { outputs = [ "out" ] ++ builtins.filter (x: x != "bin" && x != "out") attrs.outputs; diff --git a/overlay/ncurses/genode.patch b/overlay/ncurses/genode.patch new file mode 100644 index 0000000..8ba3906 --- /dev/null +++ b/overlay/ncurses/genode.patch @@ -0,0 +1,12 @@ +diff -ur a/configure b/configure +--- a/configure 2020-02-12 15:20:22.000000000 +0530 ++++ b/configure 2020-05-28 23:24:05.461176897 +0530 +@@ -6012,7 +6012,7 @@ + MK_SHARED_LIB='${LD} ${LDFLAGS} -Bshareable -o $@' + test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel + ;; +- (dragonfly*|freebsd*) ++ (dragonfly*|freebsd*|genode*) + CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC" + if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_enable_rpath" = yes ; then + LOCAL_LDFLAGS="${cf_ld_rpath_opt}\$(LOCAL_LIBDIR)"