gildas: apply upstream fix and restore parallel building

NixOS · Jul 6, 2018 · 8ae9e7e · 8ae9e7e
1 parent 72dc6fd
commit 8ae9e7e
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/pkgs/applications/science/astronomy/gildas/default.nix b/pkgs/applications/science/astronomy/gildas/default.nix
@@ -16,13 +16,13 @@ stdenv.mkDerivation rec {
     sha256 = "0kl3zf6b1kv8hgsfrarsnm2gnrdax3vi8f856249y4nxsa7lbv2i";
   };
 
-  enableParallelBuilding = false;
+  enableParallelBuilding = true;
 
   nativeBuildInputs = [ pkgconfig groff perl getopt gfortran which ];
 
   buildInputs = [ gtk2-x11 lesstif cfitsio python27Env ];
 
-  patches = [ ./wrapper.patch ./return-error-code.patch ./clang.patch ];
+  patches = [ ./wrapper.patch ./return-error-code.patch ./clang.patch ./mod.patch ];
 
   configurePhase=''
     substituteInPlace admin/wrapper.sh --replace '%%OUT%%' $out

diff --git a/pkgs/applications/science/astronomy/gildas/mod.patch b/pkgs/applications/science/astronomy/gildas/mod.patch
@@ -0,0 +1,17 @@
+diff -ruN gildas-src-jul18a/admin/Makefile.build gildas-src-jul18a.mod/admin/Makefile.build
+--- gildas-src-jul18a/admin/Makefile.build	2018-06-14 14:36:54.000000000 +0200
++++ gildas-src-jul18a.mod/admin/Makefile.build	2018-07-06 13:31:46.000000000 +0200
+@@ -291,6 +291,13 @@
+ 	win-$(LIB_IDENTITY)-und.def -o $@ $(FLDLIBS) $(LIB_DEPENDS) $(ADD_LIBS) $(SYS_LIBS))
+ endif
+
++# Dummy rules for modules just so that make consider the module a
++# valid dependency when first parsing the makefiles. This rule should
++# never be applied as the modules are a by-product of the compilation
++# of the object
++$(builddir)/%.mod:
++	echo "dummy" > /dev/null
++
+ # Fortran executables
+ $(bindir)/% : $(builddir)/%.o | $(bindir)
+ 	$(FC) $(ALL_FLDFLAGS) $< $(OBJECTS) -o $@ \