nixpkgs/pkgs/desktops/gnustep/make/gs-makefiles-additional.patch

diff -ru gnustep-make-2.6.6/common.make gnustep-make-2.6.6.patched/common.make
--- gnustep-make-2.6.6/common.make	2013-03-04 17:21:55.000000000 +0600
+++ gnustep-make-2.6.6.patched/common.make	2014-12-09 21:29:10.000000000 +0600
@@ -135,7 +135,9 @@
 endif
 # Then include makefiles with flags/config options installed by the 
 # libraries themselves
--include $(GNUSTEP_MAKEFILES)/Additional/*.make
+ifneq ($(NIX_GNUSTEP_MAKEFILES_ADDITIONAL),)
+-include $(NIX_GNUSTEP_MAKEFILES_ADDITIONAL)
+endif
 
 #
 # Determine target specific settings
diff -ru gnustep-make-2.6.6/GNUmakefile.in gnustep-make-2.6.6.patched/GNUmakefile.in
--- gnustep-make-2.6.6/GNUmakefile.in	2013-09-20 12:13:15.000000000 +0600
+++ gnustep-make-2.6.6.patched/GNUmakefile.in	2014-12-07 20:35:27.000000000 +0600
@@ -173,7 +173,6 @@
 		"$(makedir)/$(GNUSTEP_TARGET_CPU)" \
 		"$(makedir)/$(GNUSTEP_TARGET_DIR)" \
 		"$(makedir)/$(GNUSTEP_TARGET_LDIR)" \
-		"$(makedir)/Additional" \
 		"$(makedir)/Auxiliary" \
 		"$(makedir)/Master" \
 		"$(makedir)/Instance" \
@@ -314,7 +313,6 @@
 	-rmdir "$(makedir)/Instance"
 	-rmdir "$(makedir)/Master"
 	-rmdir "$(makedir)/Auxiliary"
-	-rmdir "$(makedir)/Additional"
 	-rmdir "$(makedir)/$(GNUSTEP_TARGET_LDIR)"
 	-rmdir "$(makedir)/$(GNUSTEP_TARGET_DIR)"
 	-rmdir "$(makedir)/$(GNUSTEP_TARGET_CPU)"
diff -ru gnustep-make-2.6.6/gnustep-config.in gnustep-make-2.6.6.patched/gnustep-config.in
--- gnustep-make-2.6.6/gnustep-config.in	2013-07-02 16:06:24.000000000 +0600
+++ gnustep-make-2.6.6.patched/gnustep-config.in	2014-12-09 21:29:49.000000000 +0600
@@ -66,6 +66,7 @@
     echo "    --variable=OBJCXX"
     echo "    --variable=GNUMAKE"
     echo "    --variable=GNUSTEP_MAKEFILES"
+    echo "    --variable=NIX_GNUSTEP_MAKEFILES_ADDITIONAL"
     echo "    --variable=GNUSTEP_USER_DEFAULTS_DIR"
     echo "    --variable=GNUSTEP_HOST"
     echo "    --variable=GNUSTEP_HOST_CPU"
@@ -153,6 +154,8 @@
 
 export GNUSTEP_MAKEFILES
 
+export NIX_GNUSTEP_MAKEFILES_ADDITIONAL
+
 #
 # If all they want to know if GNUSTEP_MAKEFILES or anything that
 # we can compute only using GNUSTEP_MAKEFILES, we can print it out
@@ -168,6 +171,8 @@
               exit 0;;
   --variable=GNUSTEP_MAKEFILES) echo "$GNUSTEP_MAKEFILES"
               exit 0;;
+  --variable=NIX_GNUSTEP_MAKEFILES_ADDITIONAL) echo "$NIX_GNUSTEP_MAKEFILES_ADDITIONAL"
+              exit 0;;
   --variable=GNUMAKE) echo "@GNUMAKE@"
               exit 0;;
   --debug-flags) @GNUMAKE@ -s -f "$GNUSTEP_MAKEFILES/empty.make" print-gnustep-make-objc-flags quiet=yes debug=yes 2>/dev/null
diff -ru gnustep-make-2.6.6/GNUstep.csh.in gnustep-make-2.6.6.patched/GNUstep.csh.in
--- gnustep-make-2.6.6/GNUstep.csh.in	2011-05-03 13:40:10.000000000 +0600
+++ gnustep-make-2.6.6.patched/GNUstep.csh.in	2014-12-09 20:14:05.000000000 +0600
@@ -130,6 +130,10 @@
   setenv GNUSTEP_MAKEFILES "@GNUSTEP_MAKEFILES@"
 endif
 
+if ( ! ${?NIX_GNUSTEP_MAKEFILES_ADDITIONAL} ) then
+  setenv NIX_GNUSTEP_MAKEFILES_ADDITIONAL "@NIX_GNUSTEP_MAKEFILES_ADDITIONAL@"
+endif
+
 if ( "${GNUSTEP_MAKE_STRICT_V2_MODE}" == "yes" ) then
   unsetenv GNUSTEP_USER_DIR
   unsetenv GNUSTEP_USER_ROOT
diff -ru gnustep-make-2.6.6/GNUstep.sh.in gnustep-make-2.6.6.patched/GNUstep.sh.in
--- gnustep-make-2.6.6/GNUstep.sh.in	2012-02-21 20:21:38.000000000 +0600
+++ gnustep-make-2.6.6.patched/GNUstep.sh.in	2014-12-09 20:14:19.000000000 +0600
@@ -173,6 +173,10 @@
 fi
 export GNUSTEP_MAKEFILES
 
+if [ -z "$NIX_GNUSTEP_MAKEFILES_ADDITIONAL" ]; then
+  NIX_GNUSTEP_MAKEFILES_ADDITIONAL=@NIX_GNUSTEP_MAKEFILES_ADDITIONAL@
+fi
+export NIX_GNUSTEP_MAKEFILES_ADDITIONAL
 
 if [ "$GNUSTEP_MAKE_STRICT_V2_MODE" = "yes" ]; then
   # Make sure this is never set in gnustep-make v2 strict mode; it
diff -ru gnustep-make-2.6.6/GNUstep-strict-v2.conf.in gnustep-make-2.6.6.patched/GNUstep-strict-v2.conf.in
--- gnustep-make-2.6.6/GNUstep-strict-v2.conf.in	2008-01-15 20:35:36.000000000 +0600
+++ gnustep-make-2.6.6.patched/GNUstep-strict-v2.conf.in	2014-12-07 22:04:56.000000000 +0600
@@ -47,7 +47,6 @@
 # Traditionally, this is /usr/GNUstep/System/Library/Makefiles
 GNUSTEP_MAKEFILES=@GNUSTEP_MAKEFILES@
 
-
 # This is where the user home directories are.  Only used to provide
 # NSUserDirectory in gnustep-base.  Never used anywhere else.
 GNUSTEP_SYSTEM_USERS_DIR=@GNUSTEP_SYSTEM_USERS_DIR@
diff -ru gnustep-make-2.6.6/library-combo.make gnustep-make-2.6.6.patched/library-combo.make
--- gnustep-make-2.6.6/library-combo.make	2012-02-21 19:53:02.000000000 +0600
+++ gnustep-make-2.6.6.patched/library-combo.make	2014-12-09 20:15:05.000000000 +0600
@@ -142,7 +142,7 @@
 #
 # Third-party foundations not using make package
 # Our own foundation will install a base.make file into 
-# $GNUSTEP_MAKEFILES/Additional/ to set the needed flags
+# $NIX_GNUSTEP_MAKEFILES_ADDITIONAL to set the needed flags
 #
 ifeq ($(FOUNDATION_LIB), nx)
   # -framework Foundation is used both to find headers, and to link
@@ -166,7 +166,7 @@
 
 #
 # FIXME - Ask Helge to move this inside his libFoundation, and have 
-# it installed as a $(GNUSTEP_MAKEFILES)/Additional/libFoundation.make
+# it installed as a $(NIX_GNUSTEP_MAKEFILES_ADDITIONAL)/libFoundation.make
 #
 ifeq ($(FOUNDATION_LIB),fd)
   -include $(GNUSTEP_MAKEFILES)/libFoundation.make
@@ -193,7 +193,7 @@
 GUI_LIBS = 
 #
 # Third-party GUI libraries - our own sets its flags into 
-# $(GNUSTEP_MAKEFILES)/Additional/gui.make
+# $(NIX_GNUSTEP_MAKEFILES_ADDITIONAL)/gui.make
 #
 ifeq ($(GUI_LIB), nx)
   GUI_DEFINE = -DNeXT_GUI_LIBRARY=1
diff -ru gnustep-make-2.6.6/rules.make gnustep-make-2.6.6.patched/rules.make
--- gnustep-make-2.6.6/rules.make	2013-07-04 16:05:44.000000000 +0600
+++ gnustep-make-2.6.6.patched/rules.make	2014-12-09 21:31:04.000000000 +0600
@@ -667,7 +667,9 @@
 	exit 1$(END_ECHO)
 endif
 
-$(GNUSTEP_MAKEFILES)/Additional/*.make: ;
+ifneq ($(NIX_GNUSTEP_MAKEFILES_ADDITIONAL),)
+$(NIX_GNUSTEP_MAKEFILES_ADDITIONAL): ;
+endif
 
 $(GNUSTEP_MAKEFILES)/Master/*.make: ;