gnustep: cleanup

Major clean-up. Everything builds fine.

nixos/modules/services/networking/gdomap.nix

@@ -4,7 +4,7 @@ with lib;
 
 let
   cfg = config.services.gdomap;
-  stateDir = "/var/lib/gdomap";
+  pidFile = "${cfg.pidDir}/gdomap.pid";
 in
 {
   #
@@ -20,6 +20,10 @@ in
 	  Note that gdomap runs as root.
         ";
       };
+      pidDir = mkOption {
+        default = "/var/run/gdomap";
+	description = "Location of the file which stores the PID of gdomap";
+      };
     };
   };
   #
@@ -27,20 +31,22 @@ in
   #
   config = mkIf config.services.gdomap.enable {
     # NOTE: gdomap runs as root
+    # TODO: extra user for gdomap?
     systemd.services.gdomap = {
       description = "gdomap server";
       wantedBy = [ "multi-user.target" ];
       after = [ "network.target" ];
       path  = [ pkgs.gnustep_base ];
       preStart = ''
-	mkdir -m 755 -p ${stateDir}
+        mkdir -m 0700 -p ${cfg.pidDir}
-	mkdir -m 755 -p /run/gdomap
+	chown -R nobody:nobody ${cfg.pidDir}
       '';
       serviceConfig = {
-        # NOTE: this is local-only configuration!
         ExecStart = "@${pkgs.gnustep_base}/bin/gdomap"
-	  + " -j ${stateDir} -p";
+	  + " -d -p"
-	Restart = "always"; # "no";
+	  + " -I ${pidFile}";
+#	  + " -j ${cfg.pidDir}";
+	Restart = "always";
 	RestartSec = 2;
 	TimeoutStartSec = "30";
 	Type = "forking";

nixos/modules/services/x11/gdnc.nix

@@ -3,64 +3,6 @@ with lib;
 
 let
   cfg = config.services.gdnc;
-  gnustepConf = pkgs.writeText "GNUstep.conf" ''
-    GNUSTEP_USER_CONFIG_FILE=.GNUstep.conf
-    GNUSTEP_USER_DIR=GNUstep
-    GNUSTEP_USER_DEFAULTS_DIR=GNUstep/Defaults
-    GNUSTEP_MAKEFILES=${pkgs.gnustep_make}/share/GNUstep/Makefiles
-    
-    GNUSTEP_SYSTEM_USERS_DIR=/homeless-shelter
-    GNUSTEP_NETWORK_USERS_DIR=/homeless-shelter
-    GNUSTEP_LOCAL_USERS_DIR=/homeless-shelter
-    
-    GNUSTEP_SYSTEM_APPS=${pkgs.gnustep_base}/lib/GNUstep/Applications
-    GNUSTEP_SYSTEM_ADMIN_APPS=${pkgs.gnustep_base}/lib/GNUstep/Applications
-    GNUSTEP_SYSTEM_WEB_APPS=${pkgs.gnustep_base}/lib/GNUstep/WebApplications
-    GNUSTEP_SYSTEM_TOOLS=${pkgs.gnustep_base}/bin
-    GNUSTEP_SYSTEM_ADMIN_TOOLS=${pkgs.gnustep_base}/sbin
-    GNUSTEP_SYSTEM_LIBRARY=${pkgs.gnustep_base}/lib/GNUstep
-    GNUSTEP_SYSTEM_HEADERS=${pkgs.gnustep_base}/include
-    GNUSTEP_SYSTEM_LIBRARIES=${pkgs.gnustep_base}/lib
-    GNUSTEP_SYSTEM_DOC=${pkgs.gnustep_base}/share/GNUstep/Documentation
-    GNUSTEP_SYSTEM_DOC_MAN=${pkgs.gnustep_base}/share/man
-    GNUSTEP_SYSTEM_DOC_INFO=${pkgs.gnustep_base}/share/info
-    
-    GNUSTEP_NETWORK_APPS=${pkgs.gnustep_base}/lib/GNUstep/Applications
-    GNUSTEP_NETWORK_ADMIN_APPS=${pkgs.gnustep_base}/lib/GNUstep/Applications
-    GNUSTEP_NETWORK_WEB_APPS=${pkgs.gnustep_base}/lib/GNUstep/WebApplications
-    GNUSTEP_NETWORK_TOOLS=${pkgs.gnustep_base}/bin
-    GNUSTEP_NETWORK_ADMIN_TOOLS=${pkgs.gnustep_base}/sbin
-    GNUSTEP_NETWORK_LIBRARY=${pkgs.gnustep_base}/lib/GNUstep
-    GNUSTEP_NETWORK_HEADERS=${pkgs.gnustep_base}/include
-    GNUSTEP_NETWORK_LIBRARIES=${pkgs.gnustep_base}/lib
-    GNUSTEP_NETWORK_DOC=${pkgs.gnustep_base}/share/GNUstep/Documentation
-    GNUSTEP_NETWORK_DOC_MAN=${pkgs.gnustep_base}/share/man
-    GNUSTEP_NETWORK_DOC_INFO=${pkgs.gnustep_base}/share/info
-
-    GNUSTEP_LOCAL_APPS=${pkgs.gnustep_base}/lib/GNUstep/Applications
-    GNUSTEP_LOCAL_ADMIN_APPS=${pkgs.gnustep_base}/lib/GNUstep/Applications
-    GNUSTEP_LOCAL_WEB_APPS=${pkgs.gnustep_base}/lib/GNUstep/WebApplications
-    GNUSTEP_LOCAL_TOOLS=${pkgs.gnustep_base}/bin
-    GNUSTEP_LOCAL_ADMIN_TOOLS=${pkgs.gnustep_base}/sbin
-    GNUSTEP_LOCAL_LIBRARY=${pkgs.gnustep_base}/lib/GNUstep
-    GNUSTEP_LOCAL_HEADERS=${pkgs.gnustep_base}/include
-    GNUSTEP_LOCAL_LIBRARIES=${pkgs.gnustep_base}/lib
-    GNUSTEP_LOCAL_DOC=${pkgs.gnustep_base}/share/GNUstep/Documentation
-    GNUSTEP_LOCAL_DOC_MAN=${pkgs.gnustep_base}/share/man
-    GNUSTEP_LOCAL_DOC_INFO=${pkgs.gnustep_base}/share/info
-
-    GNUSTEP_USER_DIR_APPS=GNUstep/Applications
-    GNUSTEP_USER_DIR_ADMIN_APPS=GNUstep/Applications/Admin
-    GNUSTEP_USER_DIR_WEB_APPS=GNUstep/WebApplications
-    GNUSTEP_USER_DIR_TOOLS=GNUstep/Tools
-    GNUSTEP_USER_DIR_ADMIN_TOOLS=GNUstep/Tools/Admin
-    GNUSTEP_USER_DIR_LIBRARY=GNUstep/Library
-    GNUSTEP_USER_DIR_HEADERS=GNUstep/Library/Headers
-    GNUSTEP_USER_DIR_LIBRARIES=GNUstep/Library/Libraries
-    GNUSTEP_USER_DIR_DOC=GNUstep/Library/Documentation
-    GNUSTEP_USER_DIR_DOC_MAN=GNUstep/Library/Documentation/man
-    GNUSTEP_USER_DIR_DOC_INFO=GNUstep/Library/Documentation/info
-  '';
 in {
   options = {
     services.gdnc.enable = mkOption {
@@ -75,25 +17,18 @@ in {
       assertion = config.services.gdnc.enable -> config.services.gdomap.enable;
       message = "Cannot start gdnc without starting gdomap";
     };
-    environment = {
+    environment.systemPackages = [ pkgs.gnustep_make pkgs.gnustep_base ];
-      systemPackages = [ pkgs.gnustep_make pkgs.gnustep_base ];
-    };
     systemd.services.gdnc = {
-      path = [ pkgs.gnustep_make pkgs.gnustep_base ];
+      path = [ pkgs.gnustep_base ];
       description = "gdnc: GNUstep distributed notification center";
       requires = [ "gdomap.service" ];
       wantedBy = [ "multi-user.target" ];
-      preStart = ''
-        export GNUSTEP_MAKEFILES=${pkgs.gnustep_make}/share/GNUstep/Makefiles
-      	export GNUSTEP_CONFIG_FILE=${gnustepConf}
-	. $GNUSTEP_MAKEFILES/GNUstep.sh      
-      '';
       serviceConfig = {
-        ExecStart = "@${pkgs.gnustep_base}/bin/gdnc --verbose --no-fork";
+        ExecStart = ''${pkgs.gnustep_base}/bin/gdnc --verbose'';
         Restart = "always";
-	RestartSec = 2;
+	RestartSec = 10;
 	TimeoutStartSec = "30";
-	Type = "forking";
+	Type = "simple";
       };
     };
   };

pkgs/applications/editors/gorm/default.nix

@@ -1,18 +1,18 @@
-{ stdenv, fetchurl, gnustep_base, gnustep_back, gnustep_make, gnustep_gui
+{ stdenv, fetchurl, gnustep_base, gnustep_back, gsmakeDerivation, gnustep_gui
 }:
 let
   version = "1.2.18";
 in
-stdenv.mkDerivation rec {
+gsmakeDerivation {
   name = "gorm-${version}";
   
   src = fetchurl {
     url = "ftp://ftp.gnustep.org/pub/gnustep/dev-apps/gorm-${version}.tar.gz";
     sha256 = "1vpzvmsnynlq5dv6rw9vbk1zzsim6z7b2kprrlm8dknyq0r1sdrq";
   };
-  patches = [ ./fix-gs-makefiles.patch ];
+#  patches = [ ./fix-gs-makefiles.patch ];
-  buildInputs = [ gnustep_make gnustep_base gnustep_back gnustep_gui ];
+  buildInputs = [ gnustep_base gnustep_back gnustep_gui ];
-  propagatedBuildInputs = [ gnustep_base gnustep_back gnustep_gui ];
+#  propagatedBuildInputs = [ gnustep_base gnustep_back gnustep_gui ];
 
   meta = {
     description = "Gorm stands for Graphical Object Relationship Modeller and is an easy-to-use interface designer for GNUstep";

pkgs/applications/editors/projectcenter/default.nix

@@ -1,18 +1,22 @@
 { stdenv, fetchurl
-, gnustep_base, gnustep_back, gnustep_make, gnustep_gui
+, gnustep_base, gnustep_back, gsmakeDerivation, gnustep_gui, gorm
+, gnumake, gdb
 }:
 let
   version = "0.6.2";
 in
-stdenv.mkDerivation rec {
+gsmakeDerivation {
   name = "projectcenter-${version}";
   src = fetchurl {
     url = "ftp://ftp.gnustep.org/pub/gnustep/dev-apps/ProjectCenter-${version}.tar.gz";
     sha256 = "0wwlbpqf541apw192jb633d634zkpjhcrrkd1j80y9hihphll465";
   };
 
-  buildInputs = [ gnustep_make gnustep_base gnustep_back gnustep_gui ];
+  # NOTE: need a patch for ProjectCenter to help it locate some necessary tools:
-  propagatedBuildInputs = [ gnustep_base gnustep_back gnustep_gui ];
+  # 1. Framework/PCProjectLauncher.m, locate gdb (say among NIX_GNUSTEP_SYSTEM_TOOLS)
+  # 2. Framework/PCProjectBuilder.m, locate gmake (similar)
+  buildInputs = [ gnustep_base gnustep_back gnustep_gui ];
+  propagatedBuildInputs = [ gnustep_base gnustep_back gnustep_gui gnumake gdb gorm ];
   
   meta = {
     description = "ProjectCenter is GNUstep's integrated development environment (IDE) and allows a rapid development and easy managment of ProjectCenter running on GNUstep applications, tools and frameworks.";

pkgs/applications/misc/gworkspace/default.nix

@@ -1,4 +1,4 @@
-{ gnustep_back, gnustep_base, gnustep_gui, gnustep_make
+{ gnustep_back, gnustep_base, gnustep_gui, gsmakeDerivation
 , fetchurl
 , sqlite
 , stdenv
@@ -7,7 +7,7 @@
 let
   version = "0.9.2";
 in
-stdenv.mkDerivation {
+gsmakeDerivation {
   name = "gworkspace-${version}";
   src = fetchurl {
     url = "ftp://ftp.gnustep.org/pub/gnustep/usr-apps/gworkspace-${version}.tar.gz";
@@ -16,9 +16,8 @@ stdenv.mkDerivation {
   # additional dependencies:
   # - PDFKit framework from http://gap.nongnu.org/
   # - TODO: to --enable-gwmetadata, need libDBKit as well as sqlite!
-  GNUSTEP_MAKEFILES = "${gnustep_make}/share/GNUstep/Makefiles";
+  buildInputs = [ gnustep_back gnustep_base gnustep_gui system_preferences ];
-  buildInputs = [ gnustep_back gnustep_base gnustep_make gnustep_gui system_preferences ];
+#  propagatedBuildInputs = [ gnustep_back gnustep_base gnustep_gui system_preferences ];
-  propagatedBuildInputs = [ gnustep_back gnustep_base gnustep_gui system_preferences ];
   configureFlags = [ "--with-inotify" ];
   meta = {
     description = "GWorkspace is a workspace manager for GNUstep";

pkgs/applications/misc/systempreferences/default.nix

@@ -1,19 +1,19 @@
-{ gnustep_back, gnustep_base, gnustep_gui, gnustep_make
+{ gnustep_back, gnustep_base, gnustep_gui, gsmakeDerivation
 , fetchurl
 , stdenv
 }:
 let
   version = "1.1.0";
 in
-stdenv.mkDerivation {
+gsmakeDerivation {
   name = "system_preferences-${version}";
   src = fetchurl {
     url = "ftp://ftp.gnustep.org/pub/gnustep/usr-apps/SystemPreferences-${version}.tar.gz";
     sha256 = "1q68bs8rlq0dxkar01qs5wfyas4iivddnama371jd7ll6cxzmpy7";
   };
-  GNUSTEP_MAKEFILES = "${gnustep_make}/share/GNUstep/Makefiles";
+#  GNUSTEP_MAKEFILES = "${gnustep_make}/share/GNUstep/Makefiles";
-  buildInputs = [ gnustep_back gnustep_base gnustep_make gnustep_gui ];
+  buildInputs = [ gnustep_back gnustep_base gnustep_gui ];
-  propagatedBuildInputs = [ gnustep_back gnustep_base gnustep_gui ];
+#  propagatedBuildInputs = [ gnustep_back gnustep_base gnustep_gui ];
   meta = {
     description = "System Preferences allows to manage the settings of many aspects of the GNUstep environment and its applications";
 

pkgs/development/libraries/gnustep-back/default.nix

@@ -1,8 +1,7 @@
-{ buildEnv
+{ gsmakeDerivation
 , cairo
-, clang
 , fetchurl
-, gnustep_base, gnustep_make, gnustep_gui
+, gnustep_base, gnustep_gui
 , xlibs
 , x11
 , freetype
@@ -12,13 +11,13 @@
 let
   version = "0.24.0";
 in
-stdenv.mkDerivation rec {
+gsmakeDerivation {
   name = "gnustep-back-${version}";
   src = fetchurl {
     url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-0.24.0.tar.gz";
     sha256 = "0qixbilkkrqxrhhj9hnp7ygd5gs23b3qbbgk3gaxj73d0xqfvhjz";
   };
-  buildInputs = [ cairo clang gnustep_base gnustep_gui gnustep_make freetype pkgconfig x11 ];
+  buildInputs = [ cairo gnustep_base gnustep_gui freetype pkgconfig x11 ];
   meta = {
     description = "GNUstep-back is a generic backend for GNUstep.";
     

pkgs/development/libraries/gnustep-base/default.nix

@@ -1,6 +1,6 @@
 { aspell, audiofile
-, gnustep_make
+, gsmakeDerivation
-, clang, cups
+, cups
 , fetchurl
 , gmp, gnutls
 , libffi
@@ -10,12 +10,11 @@
 , icu
 , pkgconfig, portaudio
 , stdenv
-, which
 }:
 let
   version = "1.24.7";
 in
-stdenv.mkDerivation {
+gsmakeDerivation {
   name = "gnustep-base-${version}";
   src = fetchurl {
     url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-base-1.24.7.tar.gz";
@@ -23,15 +22,14 @@ stdenv.mkDerivation {
   };
   buildInputs = [
     aspell audiofile
-    clang cups
+    cups
-    gmp gnustep_make gnutls
+    gmp gnutls
     libffi
     libjpeg libtiff libpng giflib libungif
     libxml2 libxslt libiconv
     libobjc2 libgcrypt
     icu
     pkgconfig portaudio
-    which
   ];
   propagatedBuildInputs = [
     aspell audiofile
@@ -44,7 +42,7 @@ stdenv.mkDerivation {
     icu
     portaudio
   ];
-  patches = [ ./fixup-base-makefile-installdir.patch ];
+  patches = [ ./fixup-paths.patch ];
   meta = {
     description = "GNUstep-base is an implementation of AppKit and Foundation libraries of OPENSTEP and Cocoa.";
 

pkgs/development/libraries/gnustep-base/fixup-paths.patch

@@ -0,0 +1,384 @@
+Only in gnustep-base-1.24.7: base.make
+Only in gnustep-base-1.24.7: config.mak
+Only in gnustep-base-1.24.7: config.status
+Only in gnustep-base-1.24.7/Headers/GNUstepBase: config.h
+Only in gnustep-base-1.24.7/Headers/GNUstepBase: GSConfig.h
+diff -r -u gnustep-base-1.24.7/Makefile.postamble gnustep-base-1.24.7.patched/Makefile.postamble
+--- gnustep-base-1.24.7/Makefile.postamble	2011-07-15 19:53:45.000000000 +0600
++++ gnustep-base-1.24.7.patched/Makefile.postamble	2014-11-29 22:25:07.000000000 +0600
+@@ -38,13 +38,13 @@
+ # Things to do after compiling
+ # after-all::
+ 
+-$(DESTDIR)$(GNUSTEP_MAKEFILES)/Additional:
+-	$(ECHO_CREATING)$(MKDIRS) $(DESTDIR)$(GNUSTEP_MAKEFILES)/Additional$(END_ECHO)
++$(DESTDIR_GNUSTEP_MAKEFILES)/Additional:
++	$(ECHO_CREATING)$(MKDIRS) $(DESTDIR_GNUSTEP_MAKEFILES)/Additional$(END_ECHO)
+ 
+ # Things to do before installing
+-before-install:: $(DESTDIR)$(GNUSTEP_MAKEFILES)/Additional
++before-install:: $(DESTDIR_GNUSTEP_MAKEFILES)/Additional
+ 	$(ECHO_NOTHING)$(INSTALL_DATA) base.make \
+-	    $(DESTDIR)$(GNUSTEP_MAKEFILES)/Additional/base.make$(END_ECHO)
++	    $(DESTDIR_GNUSTEP_MAKEFILES)/Additional/base.make$(END_ECHO)
+ 
+ # Things to do after installing
+ # after-install::
+@@ -54,7 +54,7 @@
+ 
+ # Things to do after uninstalling
+ after-uninstall::
+-	$(ECHO_NOTHING)rm -f $(DESTDIR)$(GNUSTEP_MAKEFILES)/Additional/base.make$(END_ECHO)
++	$(ECHO_NOTHING)rm -f $(DESTDIR_GNUSTEP_MAKEFILES)/Additional/base.make$(END_ECHO)
+ 
+ # Things to do before cleaning
+ # before-clean::
+Only in gnustep-base-1.24.7.patched: Makefile.postamble~
+Only in gnustep-base-1.24.7: result
+Only in gnustep-base-1.24.7.patched/Source: .#dfdf
+Only in gnustep-base-1.24.7.patched/Source: #dfdf#
+diff -r -u gnustep-base-1.24.7/Source/NSPathUtilities.m gnustep-base-1.24.7.patched/Source/NSPathUtilities.m
+--- gnustep-base-1.24.7/Source/NSPathUtilities.m	2014-01-14 13:21:10.000000000 +0600
++++ gnustep-base-1.24.7.patched/Source/NSPathUtilities.m	2015-01-25 13:59:37.000000000 +0600
+@@ -153,16 +153,27 @@
+ static NSString *gnustepLocalUsersDir = nil;
+ 
+ static NSString *gnustepSystemApps = nil;
++static NSArray *gnustepSystemAppsNix = nil;
+ static NSString *gnustepSystemAdminApps = nil;
++static NSArray *gnustepSystemAdminAppsNix = nil;
+ static NSString *gnustepSystemWebApps = nil;
++static NSArray *gnustepSystemWebAppsNix = nil;
+ static NSString *gnustepSystemTools = nil;
++static NSArray *gnustepSystemToolsNix = nil;
+ static NSString *gnustepSystemAdminTools = nil;
++static NSArray *gnustepSystemAdminToolsNix = nil;
+ static NSString *gnustepSystemLibrary = nil;
++static NSArray *gnustepSystemLibraryNix = nil;
+ static NSString *gnustepSystemLibraries = nil;
++static NSArray *gnustepSystemLibrariesNix = nil;
+ static NSString *gnustepSystemHeaders = nil;
++static NSArray *gnustepSystemHeadersNix = nil;
+ static NSString *gnustepSystemDocumentation = nil;
++static NSArray *gnustepSystemDocumentationNix = nil;
+ static NSString *gnustepSystemDocumentationInfo = nil;
++static NSArray *gnustepSystemDocumentationInfoNix = nil;
+ static NSString *gnustepSystemDocumentationMan = nil;
++static NSArray *gnustepSystemDocumentationManNix = nil;
+ 
+ static NSString *gnustepNetworkApps = nil;
+ static NSString *gnustepNetworkAdminApps = nil;
+@@ -258,6 +269,18 @@
+     }\
+ })
+ 
++/* Like ASSIGN_PATH, but permits multiple components in a path
++ */
++#define ASSIGN_PATH_NIX(var, dictionary, key) ({\
++  id val = getPathConfigNix(dictionary, key);\
++  if (val != nil)\
++    {\
++      RELEASE(var);\
++      var = RETAIN(val);\
++      [dictionary removeObjectForKey: key];\
++    }\
++})
++
+ /* Like ASSIGN_PATH(), but permits the result to be a relative path as that
+  * is what we normally use (the path is within the user's home directory).
+  */
+@@ -368,7 +391,7 @@
+ /* Get a full path string */
+ static inline NSString *
+ getPath(NSString *path)
+-{
++{  
+   if ([path hasPrefix: @"./"] == YES)
+     {
+       path = [gnustepConfigPath stringByAppendingPathComponent:
+@@ -383,6 +406,33 @@
+   return path;
+ }
+ 
++static inline NSArray *
++getPathConfigNix(NSDictionary *dict, NSString *key)
++{
++  NSArray *res = nil;
++  NSMutableArray *paths = nil;
++  NSString *path;
++#if defined(__MINGW_)
++  NSString *sep = @";";
++#else
++  NSString *sep = @":";
++#endif
++
++  path = [dict objectForKey: key];
++  if (path != nil)
++    {
++      if ([path rangeOfString:sep].location != NSNotFound)
++	{
++	  res = [path componentsSeparatedByString:sep];
++	}
++      else
++	{
++	  res = [[NSArray alloc] initWithObjects:path, nil];
++	}
++    }
++  return res;
++}
++
+ /* Get a full path string from a dictionary */
+ static inline NSString *
+ getPathConfig(NSDictionary *dict, NSString *key)
+@@ -468,6 +518,29 @@
+   ASSIGN_PATH(gnustepSystemDocumentationInfo, c,
+     @"GNUSTEP_SYSTEM_DOC_INFO");
+ 
++  ASSIGN_PATH_NIX(gnustepSystemAppsNix, c,
++    @"NIX_GNUSTEP_SYSTEM_APPS");
++  ASSIGN_PATH_NIX(gnustepSystemAdminAppsNix, c,
++    @"NIX_GNUSTEP_SYSTEM_ADMIN_APPS");
++  ASSIGN_PATH_NIX(gnustepSystemWebAppsNix, c,
++    @"NIX_GNUSTEP_SYSTEM_WEB_APPS");
++  ASSIGN_PATH_NIX(gnustepSystemToolsNix, c,
++    @"NIX_GNUSTEP_SYSTEM_TOOLS");
++  ASSIGN_PATH_NIX(gnustepSystemAdminToolsNix, c,
++    @"NIX_GNUSTEP_SYSTEM_ADMIN_TOOLS");
++  ASSIGN_PATH_NIX(gnustepSystemLibraryNix, c,
++    @"NIX_GNUSTEP_SYSTEM_LIBRARY");
++  ASSIGN_PATH_NIX(gnustepSystemLibrariesNix, c,
++    @"NIX_GNUSTEP_SYSTEM_LIBRARIES");
++  ASSIGN_PATH_NIX(gnustepSystemHeadersNix, c,
++    @"NIX_GNUSTEP_SYSTEM_HEADERS");
++  ASSIGN_PATH_NIX(gnustepSystemDocumentationNix, c,
++    @"NIX_GNUSTEP_SYSTEM_DOC");
++  ASSIGN_PATH_NIX(gnustepSystemDocumentationManNix, c,
++    @"NIX_GNUSTEP_SYSTEM_DOC_MAN");
++  ASSIGN_PATH_NIX(gnustepSystemDocumentationInfoNix, c,
++    @"NIX_GNUSTEP_SYSTEM_DOC_INFO");
++
+   ASSIGN_PATH(gnustepNetworkApps, c,
+     @"GNUSTEP_NETWORK_APPS");
+   ASSIGN_PATH(gnustepNetworkAdminApps, c,
+@@ -1235,6 +1308,18 @@
+   DESTROY(gnustepSystemDocumentationMan);
+   DESTROY(gnustepSystemDocumentationInfo);
+ 
++  DESTROY(gnustepSystemAppsNix);
++  DESTROY(gnustepSystemAdminAppsNix);
++  DESTROY(gnustepSystemWebAppsNix);
++  DESTROY(gnustepSystemToolsNix);
++  DESTROY(gnustepSystemAdminToolsNix);
++  DESTROY(gnustepSystemLibraryNix);
++  DESTROY(gnustepSystemLibrariesNix);
++  DESTROY(gnustepSystemHeadersNix);
++  DESTROY(gnustepSystemDocumentationNix);
++  DESTROY(gnustepSystemDocumentationManNix);
++  DESTROY(gnustepSystemDocumentationInfoNix);
++
+   DESTROY(gnustepNetworkApps);
+   DESTROY(gnustepNetworkAdminApps);
+   DESTROY(gnustepNetworkWebApps);
+@@ -2183,6 +2268,27 @@
+   if ([add_dir length] > 0 && [paths containsObject: add_dir] == NO) \
+     [paths addObject: add_dir]; \
+ }
++#define ADD_PATH_NIX(mask, base_dirs, add_dir) \
++if ((domainMask & mask) && (base_dirs != nil)) \
++{ \
++  NSEnumerator *e = [base_dirs objectEnumerator]; \
++  NSString *dir = nil; \
++  while (dir = [e nextObject]) { \
++    path = [dir stringByAppendingPathComponent: add_dir]; \
++    if ([path length] > 0 && [paths containsObject: path] == NO) \
++      [paths addObject: path]; \
++  } \
++}
++#define ADD_PLATFORM_PATH_NIX(mask, add_dirs) \
++if ((domainMask & mask) && (add_dirs != nil)) \
++{ \
++  NSEnumerator *e = [add_dirs objectEnumerator]; \
++  NSString *dir = nil; \
++  while (dir = [e nextObject]) { \
++    if ([dir length] > 0 && [paths containsObject: dir] == NO) \
++      [paths addObject:dir]; \
++  } \
++}
+ 
+   switch (directoryKey)
+     {
+@@ -2191,11 +2297,13 @@
+ 	  ADD_PLATFORM_PATH(NSUserDomainMask, gnustepUserApps);
+ 	  ADD_PLATFORM_PATH(NSLocalDomainMask, gnustepLocalApps);
+ 	  ADD_PLATFORM_PATH(NSNetworkDomainMask, gnustepNetworkApps);
++	  ADD_PLATFORM_PATH_NIX(NSSystemDomainMask, gnustepSystemAppsNix);
+ 	  ADD_PLATFORM_PATH(NSSystemDomainMask, gnustepSystemApps);
+ 
+ 	  ADD_PLATFORM_PATH(NSUserDomainMask, gnustepUserAdminApps);
+ 	  ADD_PLATFORM_PATH(NSLocalDomainMask, gnustepLocalAdminApps);
+ 	  ADD_PLATFORM_PATH(NSNetworkDomainMask, gnustepNetworkAdminApps);
++	  ADD_PLATFORM_PATH_NIX(NSSystemDomainMask, gnustepSystemAdminAppsNix);
+ 	  ADD_PLATFORM_PATH(NSSystemDomainMask, gnustepSystemAdminApps);
+ 	}
+ 	break;
+@@ -2205,6 +2313,7 @@
+ 	  ADD_PLATFORM_PATH(NSUserDomainMask, gnustepUserApps);
+ 	  ADD_PLATFORM_PATH(NSLocalDomainMask, gnustepLocalApps);
+ 	  ADD_PLATFORM_PATH(NSNetworkDomainMask, gnustepNetworkApps);
++	  ADD_PLATFORM_PATH_NIX(NSSystemDomainMask, gnustepSystemAppsNix);
+ 	  ADD_PLATFORM_PATH(NSSystemDomainMask, gnustepSystemApps);
+ 	}
+ 	break;
+@@ -2214,6 +2323,7 @@
+ 	  ADD_PLATFORM_PATH(NSUserDomainMask, gnustepUserApps);
+ 	  ADD_PLATFORM_PATH(NSLocalDomainMask, gnustepLocalApps);
+ 	  ADD_PLATFORM_PATH(NSNetworkDomainMask, gnustepNetworkApps);
++	  ADD_PLATFORM_PATH_NIX(NSSystemDomainMask, gnustepSystemAppsNix);
+ 	  ADD_PLATFORM_PATH(NSSystemDomainMask, gnustepSystemApps);
+ 
+ 	  /* I imagine if ever wanted a separate Demo directory, the
+@@ -2231,6 +2341,7 @@
+ 
+       case NSCoreServicesDirectory:
+ 	{
++	  ADD_PATH_NIX(NSSystemDomainMask, gnustepSystemLibraryNix, @"CoreServices");
+ 	  ADD_PATH(NSSystemDomainMask, gnustepSystemLibrary, @"CoreServices");
+ 	}
+ 	break;
+@@ -2248,6 +2359,7 @@
+ 	  ADD_PLATFORM_PATH(NSUserDomainMask, gnustepUserApps);
+ 	  ADD_PLATFORM_PATH(NSLocalDomainMask, gnustepLocalApps);
+ 	  ADD_PLATFORM_PATH(NSNetworkDomainMask, gnustepNetworkApps);
++	  ADD_PLATFORM_PATH_NIX(NSSystemDomainMask, gnustepSystemAppsNix);
+ 	  ADD_PLATFORM_PATH(NSSystemDomainMask, gnustepSystemApps);
+ 	}
+ 	break;
+@@ -2257,6 +2369,7 @@
+ 	  ADD_PLATFORM_PATH(NSUserDomainMask, gnustepUserAdminApps);
+ 	  ADD_PLATFORM_PATH(NSLocalDomainMask, gnustepLocalAdminApps);
+ 	  ADD_PLATFORM_PATH(NSNetworkDomainMask, gnustepNetworkAdminApps);
++	  ADD_PLATFORM_PATH_NIX(NSSystemDomainMask, gnustepSystemAdminAppsNix);
+ 	  ADD_PLATFORM_PATH(NSSystemDomainMask, gnustepSystemAdminApps);
+ 	}
+ 	break;
+@@ -2266,6 +2379,7 @@
+ 	  ADD_PLATFORM_PATH(NSUserDomainMask, gnustepUserLibrary);
+ 	  ADD_PLATFORM_PATH(NSLocalDomainMask, gnustepLocalLibrary);
+ 	  ADD_PLATFORM_PATH(NSNetworkDomainMask, gnustepNetworkLibrary);
++	  ADD_PLATFORM_PATH_NIX(NSSystemDomainMask, gnustepSystemLibraryNix);
+ 	  ADD_PLATFORM_PATH(NSSystemDomainMask, gnustepSystemLibrary);
+ 	}
+ 	break;
+@@ -2281,6 +2395,7 @@
+ 	  ADD_PLATFORM_PATH(NSUserDomainMask, gnustepUserLibrary);
+ 	  ADD_PLATFORM_PATH(NSLocalDomainMask, gnustepLocalLibrary);
+ 	  ADD_PLATFORM_PATH(NSNetworkDomainMask, gnustepNetworkLibrary);
++	  ADD_PLATFORM_PATH_NIX(NSSystemDomainMask, gnustepSystemLibraryNix);
+ 	  ADD_PLATFORM_PATH(NSSystemDomainMask, gnustepSystemLibrary);
+ 	}
+ 	break;
+@@ -2418,6 +2533,7 @@
+ 	  ADD_PLATFORM_PATH(NSUserDomainMask, gnustepUserDocumentation);
+ 	  ADD_PLATFORM_PATH(NSLocalDomainMask, gnustepLocalDocumentation);
+ 	  ADD_PLATFORM_PATH(NSNetworkDomainMask, gnustepNetworkDocumentation);
++	  ADD_PLATFORM_PATH_NIX(NSSystemDomainMask, gnustepSystemDocumentationNix);
+ 	  ADD_PLATFORM_PATH(NSSystemDomainMask, gnustepSystemDocumentation);
+ 	}
+ 	break;
+@@ -2449,6 +2565,7 @@
+ 	  ADD_PATH(NSUserDomainMask, gnustepUserLibrary, @"Caches");
+ 	  ADD_PATH(NSLocalDomainMask, gnustepLocalLibrary, @"Caches");
+ 	  ADD_PATH(NSNetworkDomainMask, gnustepNetworkLibrary, @"Caches");
++	  ADD_PATH_NIX(NSSystemDomainMask, gnustepSystemLibraryNix, @"Caches");
+ 	  ADD_PATH(NSSystemDomainMask, gnustepSystemLibrary, @"Caches");
+ 	}
+ 	break;
+@@ -2460,6 +2577,8 @@
+ 	    @"ApplicationSupport");
+ 	  ADD_PATH(NSNetworkDomainMask, gnustepNetworkLibrary,
+ 	    @"ApplicationSupport");
++	  ADD_PATH_NIX(NSSystemDomainMask, gnustepSystemLibraryNix,
++            @"ApplicationSupport");
+ 	  ADD_PATH(NSSystemDomainMask, gnustepSystemLibrary,
+ 	    @"ApplicationSupport");
+ 	}
+@@ -2471,6 +2590,7 @@
+ 	  ADD_PATH(NSUserDomainMask, gnustepUserLibrary, @"Frameworks");
+ 	  ADD_PATH(NSLocalDomainMask, gnustepLocalLibrary, @"Frameworks");
+ 	  ADD_PATH(NSNetworkDomainMask, gnustepNetworkLibrary, @"Frameworks");
++	  ADD_PATH_NIX(NSSystemDomainMask, gnustepSystemLibraryNix, @"Frameworks");
+ 	  ADD_PATH(NSSystemDomainMask, gnustepSystemLibrary, @"Frameworks");
+ 	}
+ 	break;
+@@ -2480,6 +2600,7 @@
+ 	  ADD_PATH(NSUserDomainMask, gnustepUserLibrary, @"Fonts");
+ 	  ADD_PATH(NSLocalDomainMask, gnustepLocalLibrary, @"Fonts");
+ 	  ADD_PATH(NSNetworkDomainMask, gnustepNetworkLibrary, @"Fonts");
++	  ADD_PATH_NIX(NSSystemDomainMask, gnustepSystemLibraryNix, @"Fonts");
+ 	  ADD_PATH(NSSystemDomainMask, gnustepSystemLibrary, @"Fonts");
+ 	}
+ 	break;
+@@ -2518,6 +2639,12 @@
+ 	  if (part)
+ 	    ADD_PATH(NSNetworkDomainMask, gnustepNetworkLibraries, part);
+ 
++	  ADD_PLATFORM_PATH_NIX(NSSystemDomainMask, gnustepSystemLibrariesNix);
++	  if (full)
++	    ADD_PATH_NIX(NSSystemDomainMask, gnustepSystemLibrariesNix, full);
++	  if (part)
++	    ADD_PATH_NIX(NSSystemDomainMask, gnustepSystemLibrariesNix, part);	  
++
+ 	  ADD_PLATFORM_PATH(NSSystemDomainMask, gnustepSystemLibraries);
+ 	  if (full)
+ 	    ADD_PATH(NSSystemDomainMask, gnustepSystemLibraries, full);
+@@ -2560,6 +2687,12 @@
+ 	  if (part)
+ 	    ADD_PATH(NSNetworkDomainMask, gnustepNetworkTools, part);
+ 
++	  ADD_PLATFORM_PATH_NIX(NSSystemDomainMask, gnustepSystemToolsNix);
++	  if (full)
++	    ADD_PATH_NIX(NSSystemDomainMask, gnustepSystemToolsNix, full);
++	  if (part)
++	    ADD_PATH_NIX(NSSystemDomainMask, gnustepSystemToolsNix, part);
++
+ 	  ADD_PLATFORM_PATH(NSSystemDomainMask, gnustepSystemTools);
+ 	  if (full)
+ 	    ADD_PATH(NSSystemDomainMask, gnustepSystemTools, full);
+@@ -2602,6 +2735,18 @@
+ 	  if (part)
+ 	    ADD_PATH(NSNetworkDomainMask, gnustepNetworkAdminTools, part);
+ 
++	  ADD_PLATFORM_PATH_NIX(NSSystemDomainMask, gnustepSystemAdminToolsNix);
++	  if (full)
++	    ADD_PATH_NIX(NSSystemDomainMask, gnustepSystemAdminToolsNix, full);
++	  if (part)
++	    ADD_PATH_NIX(NSSystemDomainMask, gnustepSystemAdminToolsNix, part);
++
++	  ADD_PLATFORM_PATH_NIX(NSSystemDomainMask, gnustepSystemAdminToolsNix);
++	  if (full)
++	    ADD_PATH_NIX(NSSystemDomainMask, gnustepSystemAdminToolsNix, full);
++	  if (part)
++	    ADD_PATH_NIX(NSSystemDomainMask, gnustepSystemAdminToolsNix, part);
++	  
+ 	  ADD_PLATFORM_PATH(NSSystemDomainMask, gnustepSystemAdminTools);
+ 	  if (full)
+ 	    ADD_PATH(NSSystemDomainMask, gnustepSystemAdminTools, full);
+@@ -2615,6 +2760,7 @@
+ 	  ADD_PLATFORM_PATH(NSUserDomainMask, gnustepUserWebApps);
+ 	  ADD_PLATFORM_PATH(NSLocalDomainMask, gnustepLocalWebApps);
+ 	  ADD_PLATFORM_PATH(NSNetworkDomainMask, gnustepNetworkWebApps);
++	  ADD_PLATFORM_PATH_NIX(NSSystemDomainMask, gnustepSystemWebAppsNix);
+ 	  ADD_PLATFORM_PATH(NSSystemDomainMask, gnustepSystemWebApps);
+ 	}
+ 	break;
+@@ -2622,6 +2768,8 @@
+ 
+ #undef ADD_PATH
+ #undef ADD_PLATFORM_PATH
++#undef ADD_PATH_NIX
++#undef ADD_PLATFORM_PATH_NIX
+ 
+   count = [paths count];
+   for (i = 0; i < count; i++)
+Only in gnustep-base-1.24.7.patched/Source: NSPathUtilities.m~
+Only in gnustep-base-1.24.7.patched/Tests/base/NSInvocationOperation: GNUmakefile

pkgs/development/libraries/gnustep-gui/default.nix

@@ -1,23 +1,21 @@
-{
+{ gsmakeDerivation
-  clang
 , fetchurl
-, gnustep_make
 , gnustep_base
-#, xlibs, x11, freetype
-#, pkgconfig
 , stdenv }:
 let
   version = "0.24.0";
 in
-stdenv.mkDerivation rec {
+gsmakeDerivation {
   name = "gnustep-gui-${version}";
   src = fetchurl {
     url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-gui-0.24.0.tar.gz";
     sha256 = "0d6jzfcyacxjzrr2p398ysvs1akv1fcmngfzxxbfxa947miydjxg";
   };
-  buildInputs = [ clang gnustep_make gnustep_base ];
+  buildInputs = [ gnustep_base ];
-  propagatedBuildInputs = [ gnustep_base ];
+#  propagatedBuildInputs = [ gnustep_base ];
-  patches = [ ./fixup-gui-makefile-installdir.patch ./fixup-gui-tools-preamble.patch ./fixup-gui-textconverters-preamble.patch ];
+#  patches = [ ./fixup-gui-makefile-installdir.patch ];
+  # DEBUG!
+  patches = [ ./fixup-all.patch ];
   meta = {
     description = "GNUstep-gui is a GUI class library of GNUstep.";
     

pkgs/development/libraries/gnustep-gui/fixup-all.patch

@@ -0,0 +1,486 @@
+diff -r -u gnustep-gui-0.24.0/GNUmakefile.postamble gnustep-gui-0.24.0.patched/GNUmakefile.postamble
+--- gnustep-gui-0.24.0/GNUmakefile.postamble	2010-05-17 22:38:59.000000000 +0600
++++ gnustep-gui-0.24.0.patched/GNUmakefile.postamble	2014-12-01 13:44:05.000000000 +0600
+@@ -40,20 +40,20 @@
+ # The following rule is important mainly for packaging, because in that case 
+ # you install into a fake system tree, and the directory is not there.
+ #
+-$(DESTDIR)$(GNUSTEP_MAKEFILES)/Additional:
+-	$(MKDIRS) $(DESTDIR)$(GNUSTEP_MAKEFILES)/Additional
++$(DESTDIR_GNUSTEP_MAKEFILES)/Additional:
++	$(MKDIRS) $(DESTDIR_GNUSTEP_MAKEFILES)/Additional
+ 
+ # Things to do before installing
+-before-install:: $(DESTDIR)$(GNUSTEP_MAKEFILES)/Additional
++before-install:: $(DESTDIR_GNUSTEP_MAKEFILES)/Additional
+ 	$(INSTALL_DATA) gui.make \
+-	   $(DESTDIR)$(GNUSTEP_MAKEFILES)/Additional/gui.make
++	   $(DESTDIR_GNUSTEP_MAKEFILES)/Additional/gui.make
+ 
+ # Things to do after installing
+ # after-install::
+ 
+ # Things to do before uninstalling
+  before-uninstall::
+-	rm -f $(DESTDIR)$(GNUSTEP_MAKEFILES)/Additional/gui.make
++	rm -f $(DESTDIR_GNUSTEP_MAKEFILES)/Additional/gui.make
+ 
+ # Things to do after uninstalling
+ # after-uninstall::
+Only in gnustep-gui-0.24.0.patched: GNUmakefile.postamble~
+Only in gnustep-gui-0.24.0.patched/Model: libgmodel.bundle
+Only in gnustep-gui-0.24.0.patched/Model: obj
+Only in gnustep-gui-0.24.0.patched/Source: Info-gnustep.plist
+Only in gnustep-gui-0.24.0.patched/Source: NSApplication.m~
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: externs.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: externs.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: Functions.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: Functions.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSAnimator.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSAnimator.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSAutocompleteWindow.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSAutocompleteWindow.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSCharacterPanel.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSCharacterPanel.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSDisplayServer.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSDisplayServer.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSDragView.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSDragView.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSEPSPrintOperation.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSEPSPrintOperation.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSFontInfo.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSFontInfo.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSGModelLoader.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSGModelLoader.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSGormLoader.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSGormLoader.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSGormLoading.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSGormLoading.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSHbox.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSHbox.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSHelpAttachment.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSHelpAttachment.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSHelpManagerPanel.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSHelpManagerPanel.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSHorizontalTypesetter.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSHorizontalTypesetter.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSIconManager.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSIconManager.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSImageMagickImageRep.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSImageMagickImageRep.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSInfoPanel.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSInfoPanel.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSKeyBindingAction.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSKeyBindingAction.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSKeyBindingTable.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSKeyBindingTable.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSLayoutManager.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSLayoutManager.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSMemoryPanel.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSMemoryPanel.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSModelLoaderFactory.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSModelLoaderFactory.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSNibLoader.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSNibLoader.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSNibLoading.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSNibLoading.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSPDFPrintOperation.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSPDFPrintOperation.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSPrinting.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSPrinting.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSPrintOperation.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSPrintOperation.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSServicesManager.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSServicesManager.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSSlideView.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSSlideView.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSStandardWindowDecorationView.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSStandardWindowDecorationView.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSTable.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSTable.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSTextFinder.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSTextFinder.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSTextStorage.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSTextStorage.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSThemeDrawing.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSThemeDrawing.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSThemeInspector.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSThemeInspector.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSTheme.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSThemeMenu.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSThemeMenu.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSTheme.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSThemeOpenSavePanels.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSThemeOpenSavePanels.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSThemePanel.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSThemePanel.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSThemeTools.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSThemeTools.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSTitleView.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSTitleView.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSToolbarCustomizationPalette.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSToolbarCustomizationPalette.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSToolbarView.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSToolbarView.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSToolTips.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSToolTips.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSTrackingRect.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSTrackingRect.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSTypesetter.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSTypesetter.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSVbox.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSVbox.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSWindowDecorationView.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSWindowDecorationView.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSXibLoader.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSXibLoader.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSXibLoading.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: GSXibLoading.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: linking.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: linking.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSActionCell.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSActionCell.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSAffineTransform.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSAffineTransform.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSAlert.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSAlert.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSAnimation.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSAnimation.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSApplication.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSApplication.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSArrayController.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSArrayController.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSAttributedString.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSAttributedString.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSBezierPath.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSBezierPath.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSBitmapImageRep+GIF.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSBitmapImageRep+GIF.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSBitmapImageRep+ICNS.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSBitmapImageRep+ICNS.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSBitmapImageRep+JPEG.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSBitmapImageRep+JPEG.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSBitmapImageRep.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSBitmapImageRep.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSBitmapImageRep+PNG.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSBitmapImageRep+PNG.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSBitmapImageRep+PNM.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSBitmapImageRep+PNM.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSBox.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSBox.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSBrowserCell.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSBrowserCell.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSBrowser.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSBrowser.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSBundleAdditions.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSBundleAdditions.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSButtonCell.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSButtonCell.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSButton.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSButton.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSCachedImageRep.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSCachedImageRep.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSCell.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSCell.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSClipView.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSClipView.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSCollectionViewItem.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSCollectionViewItem.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSCollectionView.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSCollectionView.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSColorList.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSColorList.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSColor.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSColor.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSColorPanel.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSColorPanel.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSColorPicker.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSColorPicker.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSColorSpace.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSColorSpace.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSColorWell.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSColorWell.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSComboBoxCell.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSComboBoxCell.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSComboBox.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSComboBox.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSController.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSController.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSControl.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSControl.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSCursor.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSCursor.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSCustomImageRep.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSCustomImageRep.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSDataLinkManager.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSDataLinkManager.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSDataLink.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSDataLink.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSDataLinkPanel.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSDataLinkPanel.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSDocumentController.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSDocumentController.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSDocument.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSDocument.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSDrawer.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSDrawer.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSEPSImageRep.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSEPSImageRep.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSEvent.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSEvent.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSFileWrapper.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSFileWrapper.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSFontDescriptor.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSFontDescriptor.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSFontManager.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSFontManager.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSFont.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSFont.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSFontPanel.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSFontPanel.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSFormCell.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSFormCell.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSForm.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSForm.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSGlyphGenerator.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSGlyphGenerator.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSGradient.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSGradient.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSGraphicsContext.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSGraphicsContext.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSHelpManager.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSHelpManager.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSHelpPanel.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSHelpPanel.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSImageCell.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSImageCell.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSImage.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSImage.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSImageRep.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSImageRep.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSImageView.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSImageView.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSInputManager.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSInputManager.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSInputServer.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSInputServer.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSInterfaceStyle.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSInterfaceStyle.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSKeyValueBinding.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSKeyValueBinding.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSLayoutManager.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSLayoutManager.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSLevelIndicatorCell.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSLevelIndicatorCell.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSLevelIndicator.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSLevelIndicator.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSMatrix.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSMatrix.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSMenuItemCell.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSMenuItemCell.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSMenuItem.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSMenuItem.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSMenu.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSMenu.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSMenuView.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSMenuView.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSMovie.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSMovie.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSMovieView.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSMovieView.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSNibAXAttributeConnector.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSNibAXAttributeConnector.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSNibAXRelationshipConnector.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSNibAXRelationshipConnector.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSNibBindingConnector.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSNibBindingConnector.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSNib.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSNib.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSObjectController.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSObjectController.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSOpenGLContext.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSOpenGLContext.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSOpenGLPixelFormat.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSOpenGLPixelFormat.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSOpenGLView.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSOpenGLView.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSOpenPanel.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSOpenPanel.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSOutlineView.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSOutlineView.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSPageLayout.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSPageLayout.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSPanel.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSPanel.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSParagraphStyle.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSParagraphStyle.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSPasteboard.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSPasteboard.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSPopover.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSPopover.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSPopUpButtonCell.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSPopUpButtonCell.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSPopUpButton.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSPopUpButton.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSPrinter.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSPrinter.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSPrintInfo.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSPrintInfo.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSPrintOperation.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSPrintOperation.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSPrintPanel.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSPrintPanel.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSProgressIndicator.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSProgressIndicator.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSResponder.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSResponder.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSRulerMarker.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSRulerMarker.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSRulerView.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSRulerView.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSSavePanel.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSSavePanel.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSScreen.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSScreen.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSScroller.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSScroller.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSScrollView.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSScrollView.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSSearchFieldCell.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSSearchFieldCell.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSSearchField.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSSearchField.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSSecureTextField.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSSecureTextField.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSSegmentedCell.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSSegmentedCell.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSSegmentedControl.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSSegmentedControl.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSSelection.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSSelection.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSShadow.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSShadow.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSSliderCell.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSSliderCell.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSSlider.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSSlider.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSSound.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSSound.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSSpeechSynthesizer.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSSpeechSynthesizer.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSSpellChecker.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSSpellChecker.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSSplitView.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSSplitView.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSStatusBar.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSStatusBar.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSStatusItem.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSStatusItem.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSStepperCell.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSStepperCell.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSStepper.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSStepper.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSStringDrawing.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSStringDrawing.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSTableColumn.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSTableColumn.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSTableHeaderCell.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSTableHeaderCell.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSTableHeaderView.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSTableHeaderView.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSTableView.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSTableView.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSTabViewItem.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSTabViewItem.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSTabView.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSTabView.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSTextAttachment.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSTextAttachment.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSTextBlock.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSTextBlock.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSTextContainer.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSTextContainer.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSTextFieldCell.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSTextFieldCell.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSTextField.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSTextField.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSTextList.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSTextList.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSText.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSText.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSTextStorage.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSTextStorage.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSTextTableBlock.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSTextTableBlock.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSTextTable.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSTextTable.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSTextView_actions.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSTextView_actions.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSTextView.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSTextView.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSTokenFieldCell.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSTokenFieldCell.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSTokenField.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSTokenField.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSToolbarItemGroup.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSToolbarItemGroup.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSToolbarItem.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSToolbarItem.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSToolbar.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSToolbar.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSTrackingArea.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSTrackingArea.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSTreeController.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSTreeController.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSTreeNode.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSTreeNode.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSUserDefaultsController.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSUserDefaultsController.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSViewController.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSViewController.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSView.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSView.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSWindowController.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSWindowController.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSWindow.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSWindow.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSWorkspace.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: NSWorkspace.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: tiff.m.d
+Only in gnustep-gui-0.24.0.patched/Source/obj/libgnustep-gui.obj: tiff.m.o
+Only in gnustep-gui-0.24.0.patched/Source/obj: libgnustep-gui.so
+Only in gnustep-gui-0.24.0.patched/Source/obj: libgnustep-gui.so.0.24
+Only in gnustep-gui-0.24.0.patched/Source/obj: libgnustep-gui.so.0.24.0
+diff -r -u gnustep-gui-0.24.0/TextConverters/RTF/GNUmakefile.preamble gnustep-gui-0.24.0.patched/TextConverters/RTF/GNUmakefile.preamble
+--- gnustep-gui-0.24.0/TextConverters/RTF/GNUmakefile.preamble	2008-06-10 10:01:49.000000000 +0600
++++ gnustep-gui-0.24.0.patched/TextConverters/RTF/GNUmakefile.preamble	2014-12-01 13:02:11.000000000 +0600
+@@ -49,7 +49,7 @@
+ ADDITIONAL_INCLUDE_DIRS +=-I../../Headers/Additions -I../../Headers
+ 
+ # Additional LDFLAGS to pass to the linker
+-#ADDITIONAL_LDFLAGS += 
++ADDITIONAL_LDFLAGS += -lgnustep-gui
+ 
+ # Additional library directories the linker should search
+ ADDITIONAL_LIB_DIRS += -L../../Source/$(GNUSTEP_OBJ_DIR)
+Only in gnustep-gui-0.24.0.patched/TextConverters/RTF: GNUmakefile.preamble~
+Only in gnustep-gui-0.24.0.patched/TextConverters/RTF: obj
+Only in gnustep-gui-0.24.0.patched/TextConverters/RTF: RTFConverter.bundle
+diff -r -u gnustep-gui-0.24.0/Tools/GNUmakefile.preamble gnustep-gui-0.24.0.patched/Tools/GNUmakefile.preamble
+--- gnustep-gui-0.24.0/Tools/GNUmakefile.preamble	2006-02-22 12:43:48.000000000 +0600
++++ gnustep-gui-0.24.0.patched/Tools/GNUmakefile.preamble	2014-12-01 12:52:41.000000000 +0600
+@@ -32,9 +32,11 @@
+ ADDITIONAL_LIB_DIRS += -L../Source/$(GNUSTEP_OBJ_DIR) -L../Model/$(GNUSTEP_OBJ_DIR)
+ 
+ # Additional libraries when linking tools
++make_services_TOOL_LIBS += -lgnustep-base
+ gpbs_TOOL_LIBS += -lgnustep-gui $(SYSTEM_LIBS)
+ set_show_service_TOOL_LIBS += -lgnustep-gui $(SYSTEM_LIBS)
+ gopen_TOOL_LIBS += -lgnustep-gui $(SYSTEM_LIBS)
++gclose_TOOL_LIBS += -lgnustep-base
+ gcloseall_TOOL_LIBS += -lgnustep-gui $(SYSTEM_LIBS)
+ GSspell_TOOL_LIBS += $(ADDITIONAL_DEPENDS)
+ 
+Only in gnustep-gui-0.24.0.patched/Tools: GNUmakefile.preamble~
+Only in gnustep-gui-0.24.0.patched/Tools: GSspell.service
+Only in gnustep-gui-0.24.0.patched/Tools: obj

pkgs/development/tools/build-managers/gnustep-make/builder.sh

@@ -0,0 +1,122 @@
+source $stdenv/setup
+
+preConfigure() {
+    . $GNUSTEP_MAKEFILES/GNUstep.sh
+}
+
+wrapGSMake() {
+    local program="$1"
+    local config="$2"
+    local wrapped="$(dirname $program)/.$(basename $program)-wrapped"
+
+    mv "$program" "$wrapped"
+
+    cat > "$program"<<EOF
+#! $SHELL -e
+
+export GNUSTEP_CONFIG_FILE="$config"
+
+exec "$wrapped" "\$@" "\${extraFlagsArray[@]}"
+EOF
+    chmod +x "$program"
+}
+
+postInstall() {
+    local conf="$out/share/.GNUstep.conf"
+
+    mkdir -p "$out/share"
+    touch $conf
+
+    # add the current package to the paths
+    local tmp="$out/lib/GNUstep/Applications"
+    if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_APPS" in *"${tmp}"*) false;; *) true;; esac; then
+	addToSearchPath NIX_GNUSTEP_SYSTEM_APPS "$tmp"
+    fi
+    tmp="$out/lib/GNUstep/Applications"
+    if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_ADMIN_APPS" in *"${tmp}"*) false;; *) true;; esac; then
+	addToSearchPath NIX_GNUSTEP_SYSTEM_ADMIN_APPS "$tmp"
+    fi
+    tmp="$out/lib/GNUstep/WebApplications"
+    if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_WEB_APPS" in *"${tmp}"*) false;; *) true;; esac; then
+	addToSearchPath NIX_GNUSTEP_SYSTEM_WEB_APPS "$tmp"
+    fi
+    tmp="$out/bin"
+    if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_TOOLS" in *"${tmp}"*) false;; *) true;; esac; then
+	addToSearchPath NIX_GNUSTEP_SYSTEM_TOOLS "$tmp"
+    fi
+    tmp="$out/sbin"
+    if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_ADMIN_TOOLS" in *"${tmp}"*) false;; *) true;; esac; then
+	addToSearchPath NIX_GNUSTEP_SYSTEM_ADMIN_TOOLS "$tmp"
+    fi
+    tmp="$out/lib/GNUstep"
+    if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_LIBRARY" in *"${tmp}"*) false;; *) true;; esac; then
+    	addToSearchPath NIX_GNUSTEP_SYSTEM_LIBRARY "$tmp"
+    fi
+    tmp="$out/include"
+    if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_HEADERS" in *"${tmp}"*) false;; *) true;; esac; then
+    	if [ -z "$NIX_GNUSTEP_SYSTEM_HEADERS" ]; then
+    	    export NIX_GNUSTEP_SYSTEM_HEADERS="$tmp"
+    	else
+    	    export NIX_GNUSTEP_SYSTEM_HEADERS+=" $tmp"
+    	fi
+    fi
+    tmp="$out/lib"
+    if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_LIBRARIES" in *"${tmp}"*) false;; *) true;; esac; then
+	addToSearchPath NIX_GNUSTEP_SYSTEM_LIBRARIES "$tmp"
+    fi
+    tmp="$out/share/GNUstep/Documentation"
+    if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_DOC" in *"${tmp}"*) false;; *) true;; esac; then
+	addToSearchPath NIX_GNUSTEP_SYSTEM_DOC "$tmp"
+    fi
+    tmp="$out/share/man"
+    if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_DOC_MAN" in *"${tmp}"*) false;; *) true;; esac; then
+	addToSearchPath NIX_GNUSTEP_SYSTEM_DOC_MAN "$tmp"
+    fi
+    tmp="$out/share/info"
+    if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_DOC_INFO" in *"${tmp}"*) false;; *) true;; esac; then
+	addToSearchPath NIX_GNUSTEP_SYSTEM_DOC_INFO "$tmp"
+    fi
+    
+    # write the config file
+    echo GNUSTEP_MAKEFILES=$GNUSTEP_MAKEFILES >> $conf
+    if [ -n "$NIX_GNUSTEP_SYSTEM_APPS" ]; then
+	echo NIX_GNUSTEP_SYSTEM_APPS="$NIX_GNUSTEP_SYSTEM_APPS"
+    fi
+    if [ -n "$NIX_GNUSTEP_SYSTEM_ADMIN_APPS" ]; then
+	echo NIX_GNUSTEP_SYSTEM_ADMIN_APPS="$NIX_GNUSTEP_SYSTEM_ADMIN_APPS" >> $conf
+    fi
+    if [ -n "$NIX_GNUSTEP_SYSTEM_WEB_APPS" ]; then
+	echo NIX_GNUSTEP_SYSTEM_WEB_APPS="$NIX_GNUSTEP_SYSTEM_WEB_APPS" >> $conf
+    fi
+    if [ -n "$NIX_GNUSTEP_SYSTEM_TOOLS" ]; then
+	echo NIX_GNUSTEP_SYSTEM_TOOLS="$NIX_GNUSTEP_SYSTEM_TOOLS" >> $conf
+    fi
+    if [ -n "$NIX_GNUSTEP_SYSTEM_ADMIN_TOOLS" ]; then
+	echo NIX_GNUSTEP_SYSTEM_ADMIN_TOOLS="$NIX_GNUSTEP_SYSTEM_ADMIN_TOOLS" >> $conf
+    fi
+    if [ -n "$NIX_GNUSTEP_SYSTEM_LIBRARY" ]; then
+	echo NIX_GNUSTEP_SYSTEM_LIBRARY="$NIX_GNUSTEP_SYSTEM_LIBRARY" >> $conf
+    fi
+    if [ -n "$NIX_GNUSTEP_SYSTEM_HEADERS" ]; then
+	echo NIX_GNUSTEP_SYSTEM_HEADERS="$NIX_GNUSTEP_SYSTEM_HEADERS" >> $conf
+    fi
+    if [ -n "$NIX_GNUSTEP_SYSTEM_LIBRARIES" ]; then
+	echo NIX_GNUSTEP_SYSTEM_LIBRARIES="$NIX_GNUSTEP_SYSTEM_LIBRARIES" >> $conf
+    fi
+    if [ -n "$NIX_GNUSTEP_SYSTEM_DOC" ]; then
+	echo NIX_GNUSTEP_SYSTEM_DOC="$NIX_GNUSTEP_SYSTEM_DOC" >> $conf
+    fi
+    if [ -n "$NIX_GNUSTEP_SYSTEM_DOC_MAN" ]; then
+	echo NIX_GNUSTEP_SYSTEM_DOC_MAN="$NIX_GNUSTEP_SYSTEM_DOC_MAN" >> $conf
+    fi
+    if [ -n "$NIX_GNUSTEP_SYSTEM_DOC_INFO" ]; then
+	echo NIX_GNUSTEP_SYSTEM_DOC_INFO="$NIX_GNUSTEP_SYSTEM_DOC_INFO" >> $conf
+    fi
+    
+    for i in $out/bin/*; do
+	echo "wrapping $(basename $i)"
+	wrapGSMake "$i" "$out/share/.GNUstep.conf"
+    done
+}
+
+genericBuild

pkgs/development/tools/build-managers/gnustep-make/default.nix

@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   };
   configureFlags = "--with-installation-domain=SYSTEM";
   buildInputs = [ clang which libobjc2 ];
-  patches = [ ./gs-makefiles-additional.patch ];
+  patches = [ ./fixup-paths.patch ];
   setupHook = ./setup-hook.sh;
   meta = {
     description = "GNUstep-make is a build manager for GNUstep.";

pkgs/development/tools/build-managers/gnustep-make/fixup-paths.patch

@@ -0,0 +1,204 @@
+diff -r -u 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	2015-01-18 14:36:25.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
+Only in gnustep-make-2.6.6.patched: common.make~
+Only in gnustep-make-2.6.6.patched: configure.ac~
+diff -r -u 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 -r -u 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
+Only in gnustep-make-2.6.6.patched: gnustep-config.in~
+diff -r -u 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
+Only in gnustep-make-2.6.6.patched: GNUstep.csh.in~
+diff -r -u 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	2015-01-18 14:48:09.000000000 +0600
+@@ -173,7 +173,6 @@
+ fi
+ export GNUSTEP_MAKEFILES
+ 
+-
+ if [ "$GNUSTEP_MAKE_STRICT_V2_MODE" = "yes" ]; then
+   # Make sure this is never set in gnustep-make v2 strict mode; it
+   # might have been set in the config file.
+@@ -300,7 +299,7 @@
+ # for each duplicate.  When there are many duplicates it's faster to
+ # use print_unique_pathlist.sh first to remove them and skip the
+ # echos+greps later.
+-GNUSTEP_TOOLS_PATHLIST=`$GNUSTEP_MAKEFILES/print_unique_pathlist.sh "$GNUSTEP_USER_TOOLS" "$GNUSTEP_LOCAL_TOOLS" "$GNUSTEP_NETWORK_TOOLS" "$GNUSTEP_SYSTEM_TOOLS" $fixup_paths`
++GNUSTEP_TOOLS_PATHLIST=$NIX_GNUSTEP_SYSTEM_TOOLS
+ 
+ # Now, we check the paths in GNUSTEP_*_ADMIN_TOOLS.  These paths
+ # should only be used by Administrators -- normal users don't have
+@@ -313,7 +312,7 @@
+ 
+ # So we examine GNUSTEP_*_ADMIN_TOOLS; if we find any path in that
+ # list that exists and that we can write to, we add it to our PATH.
+-for dir in "$GNUSTEP_SYSTEM_ADMIN_TOOLS" "$GNUSTEP_NETWORK_ADMIN_TOOLS" "$GNUSTEP_LOCAL_ADMIN_TOOLS" "$GNUSTEP_USER_ADMIN_TOOLS"; do
++for dir in $(echo "$NIX_GNUSTEP_SYSTEM_ADMIN_TOOLS" | tr ":" "\n"); do
+   if [ -d "$dir"  -a  -w "$dir" ]; then
+     # Only add the new dir if it's not already in GNUSTEP_TOOLS_PATHLIST
+     if (echo ":${GNUSTEP_TOOLS_PATHLIST}:" \
+@@ -356,7 +355,7 @@
+ export PATH
+ 
+ # Determine the library paths
+-GNUSTEP_LIBRARIES_PATHLIST=`$GNUSTEP_MAKEFILES/print_unique_pathlist.sh "$GNUSTEP_USER_LIBRARIES" "$GNUSTEP_LOCAL_LIBRARIES" "$GNUSTEP_NETWORK_LIBRARIES" "$GNUSTEP_SYSTEM_LIBRARIES" $fixup_paths`
++GNUSTEP_LIBRARIES_PATHLIST=$NIX_GNUSTEP_SYSTEM_LIBRARIES
+ 
+ old_IFS="$IFS"
+ IFS=:
+@@ -486,7 +485,7 @@
+ #
+ # Setup Java CLASSPATH and Guile GUILE_LOAD_PATH
+ #
+-GNUSTEP_LIBRARY_PATHLIST=`$GNUSTEP_MAKEFILES/print_unique_pathlist.sh "$GNUSTEP_USER_LIBRARY" "$GNUSTEP_LOCAL_LIBRARY" "$GNUSTEP_NETWORK_LIBRARY" "$GNUSTEP_SYSTEM_LIBRARY" $fixup_paths`
++GNUSTEP_LIBRARY_PATHLIST=$NIX_GNUSTEP_SYSTEM_LIBRARY
+ 
+ old_IFS="$IFS"
+ IFS=:
+@@ -526,7 +525,7 @@
+ # xxx/Library/Documentation/info, are found by the info browsing
+ # programs.  To get this effect, we add those paths to INFOPATH.
+ #
+-GNUSTEP_INFO_PATHLIST=`$GNUSTEP_MAKEFILES/print_unique_pathlist.sh "$GNUSTEP_USER_DOC_INFO" "$GNUSTEP_LOCAL_DOC_INFO" "$GNUSTEP_NETWORK_DOC_INFO" "$GNUSTEP_SYSTEM_DOC_INFO" $fixup_paths`
++GNUSTEP_INFO_PATHLIST=$NIX_GNUSTEP_SYSTEM_DOC_INFO
+ old_IFS="$IFS"
+ IFS=:
+ for dir in $GNUSTEP_INFO_PATHLIST; do
+@@ -559,6 +558,7 @@
+ 
+   unset GNUSTEP_KEEP_CONFIG_FILE GNUSTEP_KEEP_USER_CONFIG_FILE
+ 
++  
+   export GNUSTEP_CONFIG_FILE GNUSTEP_USER_CONFIG_FILE
+ 
+   export GNUSTEP_USER_DEFAULTS_DIR
+Only in gnustep-make-2.6.6.patched: GNUstep.sh.in~
+diff -r -u 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@
+Only in gnustep-make-2.6.6.patched: GNUstep-strict-v2.conf.in~
+diff -r -u 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
+Only in gnustep-make-2.6.6.patched: library-combo.make~
+Only in gnustep-make-2.6.6.patched: result
+diff -r -u 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: ;
+ 
+Only in gnustep-make-2.6.6.patched: rules.make~

pkgs/development/tools/build-managers/gnustep-make/gsmakeDerivation.nix

@@ -0,0 +1,11 @@
+{ stdenv, lib, libobjc2, clang, gnustep_make, makeWrapper, which }:
+{ buildInputs ? []
+, ...} @ args:
+stdenv.mkDerivation (args // {
+  buildInputs = [ makeWrapper gnustep_make which ] ++ buildInputs;
+
+  builder = ./builder.sh;
+  setupHook = ./setup-hook.sh;
+
+  GNUSTEP_MAKEFILES = "${gnustep_make}/share/GNUstep/Makefiles";
+})

pkgs/development/tools/build-managers/gnustep-make/setup-hook.sh

@@ -16,12 +16,62 @@ installFlagsArray=( \
   "GNUSTEP_SYSTEM_DOC_INFO=$out/share/info" \
 )
 
-addGSMakefilesPath () {
+addEnvVars() {
     local filename
 
     for filename in $1/share/GNUstep/Makefiles/Additional/*.make ; do
-	export NIX_GNUSTEP_MAKEFILES_ADDITIONAL="$NIX_GNUSTEP_MAKEFILES_ADDITIONAL $filename"
+	if case "$NIX_GNUSTEP_MAKEFILES_ADDITIONAL" in *"{$filename}"*) false;; *) true;; esac; then
+	    export NIX_GNUSTEP_MAKEFILES_ADDITIONAL+=" $filename"
+	fi
     done
-}
 
-envHooks=(${envHooks[@]} addGSMakefilesPath)
+    local tmp="$1/lib/GNUstep/Applications"
+    if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_APPS" in *"${tmp}"*) false;; *) true;; esac; then
+	addToSearchPath NIX_GNUSTEP_SYSTEM_APPS "$tmp"
+    fi
+    tmp="$1/lib/GNUstep/Applications"
+    if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_ADMIN_APPS" in *"${tmp}"*) false;; *) true;; esac; then
+	addToSearchPath NIX_GNUSTEP_SYSTEM_ADMIN_APPS "$tmp"
+    fi
+    tmp="$1/lib/GNUstep/WebApplications"
+    if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_WEB_APPS" in *"${tmp}"*) false;; *) true;; esac; then
+	addToSearchPath NIX_GNUSTEP_SYSTEM_WEB_APPS "$tmp"
+    fi
+    tmp="$1/bin"
+    if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_TOOLS" in *"${tmp}"*) false;; *) true;; esac; then
+	addToSearchPath NIX_GNUSTEP_SYSTEM_TOOLS "$tmp"
+    fi
+    tmp="$1/sbin"
+    if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_ADMIN_TOOLS" in *"${tmp}"*) false;; *) true;; esac; then
+	addToSearchPath NIX_GNUSTEP_SYSTEM_ADMIN_TOOLS "$tmp"
+    fi
+    tmp="$1/lib/GNUstep"
+    if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_LIBRARY" in *"${tmp}"*) false;; *) true;; esac; then
+    	addToSearchPath NIX_GNUSTEP_SYSTEM_LIBRARY "$tmp"
+    fi
+    tmp="$1/include"
+    if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_HEADERS" in *"${tmp}"*) false;; *) true;; esac; then
+    	if [ -z "$NIX_GNUSTEP_SYSTEM_HEADERS" ]; then
+    	    export NIX_GNUSTEP_SYSTEM_HEADERS="$tmp"
+    	else
+    	    export NIX_GNUSTEP_SYSTEM_HEADERS+=" $tmp"
+    	fi
+    fi
+    tmp="$1/lib"
+    if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_LIBRARIES" in *"${tmp}"*) false;; *) true;; esac; then
+	addToSearchPath NIX_GNUSTEP_SYSTEM_LIBRARIES "$tmp"
+    fi
+    tmp="$1/share/GNUstep/Documentation"
+    if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_DOC" in *"${tmp}"*) false;; *) true;; esac; then
+	addToSearchPath NIX_GNUSTEP_SYSTEM_DOC "$tmp"
+    fi
+    tmp="$1/share/man"
+    if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_DOC_MAN" in *"${tmp}"*) false;; *) true;; esac; then
+	addToSearchPath NIX_GNUSTEP_SYSTEM_DOC_MAN "$tmp"
+    fi
+    tmp="$1/share/info"
+    if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_DOC_INFO" in *"${tmp}"*) false;; *) true;; esac; then
+	addToSearchPath NIX_GNUSTEP_SYSTEM_DOC_INFO "$tmp"
+    fi
+}
+envHooks=(${envHooks[@]} addEnvVars)

pkgs/development/tools/build-managers/gnustep-make/wrapper.sh

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+. $GNUSTEP_MAKEFILES/GNUstep.sh
+$1

pkgs/top-level/all-packages.nix

@@ -6446,7 +6446,10 @@ in
 
   gnustep_back = callPackage ../development/libraries/gnustep-back { stdenv = clangStdenv; };
   gnustep_base = callPackage ../development/libraries/gnustep-base { stdenv = clangStdenv; giflib = giflib_4_1; };
+
   gnustep_make = callPackage ../development/tools/build-managers/gnustep-make { stdenv = clangStdenv; };
+  gsmakeDerivation = callPackage ../development/tools/build-managers/gnustep-make/gsmakeDerivation.nix { stdenv = clangStdenv; };
+  
   gnustep_gui = callPackage ../development/libraries/gnustep-gui { stdenv = clangStdenv; };
 
   gob2 = callPackage ../development/tools/misc/gob2 { };