nur-packages

commit 994f6eba6c4ae416cff42ce8b59a467803b370db
parent 601143a9a3f2283dd292b31078fb51776e756f6f
Author: Nikolay Korotkiy <sikmir@gmail.com>
Date:   Wed, 15 Jan 2020 01:42:09 +0300

Update embox

Diffstat:
M
nix/sources.json
 | 
6
+++---
M
pkgs/embox/0001-fix-build.patch
 | 
26
--------------------------

2 files changed, 3 insertions(+), 29 deletions(-)
diff --git a/nix/sources.json b/nix/sources.json
@@ -65,10 +65,10 @@
         "homepage": "http://embox.github.io",
         "owner": "embox",
         "repo": "embox",
-        "rev": "6f8a4207fb9649b2572b8c23c056fc776f2e4492",
-        "sha256": "1fwp3wk9hn3ra0ls7z4bxzrpmdrcvidlcaiv5xx766397hdk12r0",
+        "rev": "f78bb141bb36124e9738110f14de2f55e7bd0ab6",
+        "sha256": "10knbp9fvqsg7vy53cqi450ikn76pmdarx09qvwakgkpjj6v30zm",
         "type": "tarball",
-        "url": "https://github.com/embox/embox/archive/6f8a4207fb9649b2572b8c23c056fc776f2e4492.tar.gz",
+        "url": "https://github.com/embox/embox/archive/f78bb141bb36124e9738110f14de2f55e7bd0ab6.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "google-translate-for-goldendict": {
diff --git a/pkgs/embox/0001-fix-build.patch b/pkgs/embox/0001-fix-build.patch
@@ -36,29 +36,3 @@ index baf62448e..7d5c2a74b 100644
  
  comma_sep_list = $(subst $(\s),$(,),$(strip $1))
  
-diff --git i/mk/image2.mk w/mk/image2.mk
-index be5f39879..ad7f2b52f 100644
---- i/mk/image2.mk
-+++ w/mk/image2.mk
-@@ -51,7 +51,7 @@ $(ROOTFS_DIR)/% :
- 	$(CP) -r $(cp_T_if_supported) $(src_file) $@$(if \
- 		$(and $(chmod),$(findstring $(chmod),'')),,;chmod $(chmod) $@)
- 	@touch $@ # workaround when copying directories
--	@find $@ -name .gitkeep -type f -print0 | xargs -0 /bin/rm -rf
-+	@find $@ -name .gitkeep -type f -print0 | xargs -0 rm -rf
- 
- fmt_line = $(addprefix \$(\n)$(\t)$(\t),$1)
- 
-diff --git i/mk/image3.mk w/mk/image3.mk
-index 34d1cf656..9c8ffaf37 100644
---- i/mk/image3.mk
-+++ w/mk/image3.mk
-@@ -283,7 +283,7 @@ $(__cpio_files) : FORCE
- 		$(foreach c,chmod chown,$(if $(and $($c),$(findstring $($c),'')),,$c $($c) $f;)) \
- 		$(foreach a,$(strip $(subst ',,$(xattr))), \
- 			attr -s $(basename $(subst =,.,$a)) -V $(subst .,,$(suffix $(subst =,.,$a))) $f;) \
--		find $f -name .gitkeep -type f -print0 | xargs -0 /bin/rm -rf)
-+		find $f -name .gitkeep -type f -print0 | xargs -0 rm -rf)
- 
- __copy_user_rootfs :
- 	if [ -d $(USER_ROOTFS_DIR) ]; \