nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-17 19:23:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #283910 from mfrw/mfrw/most-5.2.0

Browse Source 
most: 5.1.0 -> 5.2.0
This commit is contained in:
Nick Cao 2024-01-27 10:50:55 -05:00 committed by GitHub
commit 7ea0c16dde
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/tools/misc/most/default.nix
View File

@ -2,18 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "most"; pname = "most";
version = "5.1.0"; version = "5.2.0";
src = fetchurl { src = fetchurl {
url = "https://www.jedsoft.org/releases/${pname}/${pname}-${version}.tar.gz"; url = "https://www.jedsoft.org/releases/${pname}/${pname}-${version}.tar.gz";
sha256 = "008537ns659pw2aag15imwjrxj73j26aqq90h285is6kz8gmv06v"; hash = "sha256-lFWuuPgm+oOFyFDcIr8PIs+QabPDQj+6S/LG9iJtmQM=";
}; };
patches = [
# Upstream patch to fix parallel build failure
./parallel-make.patch
];
outputs = [ "out" "doc" ]; outputs = [ "out" "doc" ];
makeFlags = [ makeFlags = [

18
pkgs/tools/misc/most/parallel-make.patch
View File

@ -1,18 +0,0 @@
Upstream commit c9cfad50a ("src/Makefile.in: Avoid a race condition
when performing a parallel build")
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -54,6 +54,12 @@ COMPILE_CMD = $(CC) -c $(ALL_CFLAGS) -DMOST_SYSTEM_INITFILE='"$(SYS_INITFILE)"'
all: $(EXEC)
$(EXEC): $(OBJDIR) $(CONFIG_H) slangversion $(OBJDIR)/$(EXEC)
@echo $(EXEC) created in $(OBJDIR)
+
+# C source files include autogenrated "config.h". Make sure
+# it's available before the compilation. Pessimistically assume
+# any source file can depend on "config.h".
+$(OBJS) $(OBJDIR)/chkslang.o: $(CONFIG_H)
+
$(OBJDIR)/$(EXEC): $(OBJS)
cd $(OBJDIR); $(CC) $(OFILES) -o $(EXEC) $(LDFLAGS) $(EXECLIBS)
#