nur-packages

commit ab913984ed8ec1c87bf72d479ea294410b14ef21
parent 729ddf76d0fdbd0ef752fedb86f73f4a974cb887
Author: Nikolay Korotkiy <sikmir@disroot.org>
Date:   Thu, 23 Oct 2025 23:41:26 +0400

Up

Diffstat:
M
pkgs/embedded/embox/0001-fix-build.patch
 | 
16
++++++++--------
M
pkgs/embedded/embox/default.nix
 | 
7
+++++--

2 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/pkgs/embedded/embox/0001-fix-build.patch b/pkgs/embedded/embox/0001-fix-build.patch
@@ -1,11 +1,11 @@
-diff --git i/mk/flags.mk w/mk/flags.mk
-index 522274885..35745d98c 100644
---- i/mk/flags.mk
-+++ w/mk/flags.mk
-@@ -13,14 +13,14 @@ BUILD_DEPS_CPPFLAGS_AFTER ?=
- BUILD_DEPS_LDFLAGS ?=
- 
+diff --git c/mk/flags.mk i/mk/flags.mk
+index cc977f7a07..acc4ce050a 100644
+--- c/mk/flags.mk
++++ i/mk/flags.mk
+@@ -23,14 +23,14 @@ MODULE_CPPFLAGS ?=
+ COMPILER ?= gcc
  CROSS_COMPILE ?=
+ 
 -CXX     ?= $(CROSS_COMPILE)g++
 -AR      ?= $(CROSS_COMPILE)ar
 -AS      ?= $(CROSS_COMPILE)as
@@ -25,7 +25,7 @@ index 522274885..35745d98c 100644
  
  ifeq ($(COMPILER),clang)
  CC      := clang
-@@ -29,7 +29,7 @@ else
+@@ -39,7 +39,7 @@ else
  CC      := $(CROSS_COMPILE)gcc
  LIBGCC_FINDER=$(CC) $(CFLAGS)
  endif
diff --git a/pkgs/embedded/embox/default.nix b/pkgs/embedded/embox/default.nix
@@ -5,6 +5,7 @@
   fetchurl,
   makeWrapper,
   pkgsCross,
+  bash,
   cpio,
   gcc-arm-embedded,
   python3,
@@ -29,18 +30,20 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "embox-${arch}-qemu";
-  version = "0.6.7";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "embox";
     repo = "embox";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-u9aMFFgscXHfS8pxh+H0n4j82xkwkQQi/OPwhmcpZxw=";
+    hash = "sha256-S9ziXX0DGrrH3Lame2yfMYSYRcCp8jQ3l+yeqGlSJ0g=";
   };
 
   patches = [ ./0001-fix-build.patch ];
 
   postPatch = ''
+    substituteInPlace mk/extbld/compiler_start.sh \
+      --replace "/usr/bin/env bash" "${lib.getExe bash}"
     substituteInPlace templates/aarch64/qemu/build.conf \
       --replace-fail "aarch64-elf" "aarch64-none-elf"
     substituteInPlace templates/ppc/qemu/build.conf \