commit c2bfce8de84578710d7356889c08ec86005b9999 · pyrox.dev/nixpkgs

+1

lib/maintainers.nix

··· 39 39 aristid = "Aristid Breitkreuz <aristidb@gmail.com>"; 40 40 arobyn = "Alexei Robyn <shados@shados.net>"; 41 41 artuuge = "Artur E. Ruuge <artuuge@gmail.com>"; 42 + ashalkhakov = "Artyom Shalkhakov <artyom.shalkhakov@gmail.com>"; 42 43 asppsa = "Alastair Pharo <asppsa@gmail.com>"; 43 44 astsmtl = "Alexander Tsamutali <astsmtl@yandex.ru>"; 44 45 aszlig = "aszlig <aszlig@redmoonstudios.org>";

+1

nixos/modules/module-list.nix

··· 340 340 ./services/networking/freenet.nix 341 341 ./services/networking/gale.nix 342 342 ./services/networking/gateone.nix 343 + ./services/networking/gdomap.nix 343 344 ./services/networking/git-daemon.nix 344 345 ./services/networking/gnunet.nix 345 346 ./services/networking/gogoclient.nix

+32

nixos/modules/services/networking/gdomap.nix

··· 1 + { config, lib, pkgs, ... }: 2 + 3 + with lib; 4 + 5 + let 6 + cfg = config.services.gdomap; 7 + in 8 + { 9 + # 10 + # interface 11 + # 12 + options = { 13 + services.gdomap = { 14 + enable = mkEnableOption "GNUstep Distributed Objects name server"; 15 + }; 16 + }; 17 + 18 + # 19 + # implementation 20 + # 21 + config = mkIf config.services.gdomap.enable { 22 + # NOTE: gdomap runs as root 23 + # TODO: extra user for gdomap? 24 + systemd.services.gdomap = { 25 + description = "gdomap server"; 26 + wantedBy = [ "multi-user.target" ]; 27 + after = [ "network.target" ]; 28 + path = [ pkgs.gnustep.base ]; 29 + serviceConfig.ExecStart = "${pkgs.gnustep.base}/bin/gdomap -f"; 30 + }; 31 + }; 32 + }

+22

pkgs/desktops/gnustep/back/default.nix

··· 1 + { gsmakeDerivation 2 + , cairo 3 + , fetchurl 4 + , base, gui 5 + , x11 6 + , freetype 7 + , pkgconfig 8 + }: 9 + let 10 + version = "0.25.0"; 11 + in 12 + gsmakeDerivation { 13 + name = "gnustep-back-${version}"; 14 + src = fetchurl { 15 + url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-${version}.tar.gz"; 16 + sha256 = "14gs1b32ahnihd7mwpjrws2b8hl11rl1wl24a7651d3z2l7f6xj2"; 17 + }; 18 + buildInputs = [ cairo base gui freetype pkgconfig x11 ]; 19 + meta = { 20 + description = "A generic backend for GNUstep"; 21 + }; 22 + }

+14

pkgs/desktops/gnustep/back/fixup-tools.patch

··· 1 + diff -c gnustep-back-0.24.0/Tools/GNUmakefile.preamble gnustep-back-0.24.0.patched/Tools/GNUmakefile.preamble 2 + --- gnustep-back-0.24.0/Tools/GNUmakefile.preamble 2013-07-04 22:44:28.000000000 +0600 3 + +++ gnustep-back-0.24.0.patched/Tools/GNUmakefile.preamble 2014-12-01 16:40:37.000000000 +0600 4 + @@ -52,6 +52,9 @@ 5 + # Additional libraries when linking applications 6 + #ADDITIONAL_GUI_LIBS += 7 + 8 + +# Additional libraries when linking tools 9 + +gpbs_TOOL_LIBS += -lgnustep-gui -lgnustep-base $(SYSTEM_LIBS) 10 + + 11 + # 12 + # Flags dealing with installing and uninstalling 13 + # 14 +

+38

pkgs/desktops/gnustep/base/default.nix

··· 1 + { aspell, audiofile 2 + , gsmakeDerivation 3 + , cups 4 + , fetchurl 5 + , gmp, gnutls 6 + , libffi 7 + , libjpeg, libtiff, libpng, giflib, libungif 8 + , libxml2, libxslt, libiconv 9 + , libobjc, libgcrypt 10 + , icu 11 + , pkgconfig, portaudio 12 + }: 13 + let 14 + version = "1.24.9"; 15 + in 16 + gsmakeDerivation { 17 + name = "gnustep-base-${version}"; 18 + src = fetchurl { 19 + url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-base-${version}.tar.gz"; 20 + sha256 = "1vvjlbqmlwr82b4pf8c62rxjgz475bmg0x2yd0bbkia6yvwhk585"; 21 + }; 22 + nativeBuildInputs = [ pkgconfig ]; 23 + propagatedBuildInputs = [ 24 + aspell audiofile 25 + cups 26 + gmp gnutls 27 + libffi 28 + libjpeg libtiff libpng giflib libungif 29 + libxml2 libxslt libiconv 30 + libobjc libgcrypt 31 + icu 32 + portaudio 33 + ]; 34 + patches = [ ./fixup-paths.patch ]; 35 + meta = { 36 + description = "An implementation of AppKit and Foundation libraries of OPENSTEP and Cocoa"; 37 + }; 38 + }

+29

pkgs/desktops/gnustep/base/fixup-base-makefile-installdir.patch

··· 1 + --- gnustep-base-1.24.7/Makefile.postamble 2011-07-15 19:53:45.000000000 +0600 2 + +++ gnustep-base-1.24.7.patched/Makefile.postamble 2014-11-29 22:25:07.000000000 +0600 3 + @@ -38,13 +38,13 @@ 4 + # Things to do after compiling 5 + # after-all:: 6 + 7 + -$(DESTDIR)$(GNUSTEP_MAKEFILES)/Additional: 8 + - $(ECHO_CREATING)$(MKDIRS) $(DESTDIR)$(GNUSTEP_MAKEFILES)/Additional$(END_ECHO) 9 + +$(DESTDIR_GNUSTEP_MAKEFILES)/Additional: 10 + + $(ECHO_CREATING)$(MKDIRS) $(DESTDIR_GNUSTEP_MAKEFILES)/Additional$(END_ECHO) 11 + 12 + # Things to do before installing 13 + -before-install:: $(DESTDIR)$(GNUSTEP_MAKEFILES)/Additional 14 + +before-install:: $(DESTDIR_GNUSTEP_MAKEFILES)/Additional 15 + $(ECHO_NOTHING)$(INSTALL_DATA) base.make \ 16 + - $(DESTDIR)$(GNUSTEP_MAKEFILES)/Additional/base.make$(END_ECHO) 17 + + $(DESTDIR_GNUSTEP_MAKEFILES)/Additional/base.make$(END_ECHO) 18 + 19 + # Things to do after installing 20 + # after-install:: 21 + @@ -54,7 +54,7 @@ 22 + 23 + # Things to do after uninstalling 24 + after-uninstall:: 25 + - $(ECHO_NOTHING)rm -f $(DESTDIR)$(GNUSTEP_MAKEFILES)/Additional/base.make$(END_ECHO) 26 + + $(ECHO_NOTHING)rm -f $(DESTDIR_GNUSTEP_MAKEFILES)/Additional/base.make$(END_ECHO) 27 + 28 + # Things to do before cleaning 29 + # before-clean::

+373

pkgs/desktops/gnustep/base/fixup-paths.patch

··· 1 + diff -r -u gnustep-base-1.24.7/Makefile.postamble gnustep-base-1.24.7.patched/Makefile.postamble 2 + --- gnustep-base-1.24.7/Makefile.postamble 2011-07-15 19:53:45.000000000 +0600 3 + +++ gnustep-base-1.24.7.patched/Makefile.postamble 2014-11-29 22:25:07.000000000 +0600 4 + @@ -38,13 +38,13 @@ 5 + # Things to do after compiling 6 + # after-all:: 7 + 8 + -$(DESTDIR)$(GNUSTEP_MAKEFILES)/Additional: 9 + - $(ECHO_CREATING)$(MKDIRS) $(DESTDIR)$(GNUSTEP_MAKEFILES)/Additional$(END_ECHO) 10 + +$(DESTDIR_GNUSTEP_MAKEFILES)/Additional: 11 + + $(ECHO_CREATING)$(MKDIRS) $(DESTDIR_GNUSTEP_MAKEFILES)/Additional$(END_ECHO) 12 + 13 + # Things to do before installing 14 + -before-install:: $(DESTDIR)$(GNUSTEP_MAKEFILES)/Additional 15 + +before-install:: $(DESTDIR_GNUSTEP_MAKEFILES)/Additional 16 + $(ECHO_NOTHING)$(INSTALL_DATA) base.make \ 17 + - $(DESTDIR)$(GNUSTEP_MAKEFILES)/Additional/base.make$(END_ECHO) 18 + + $(DESTDIR_GNUSTEP_MAKEFILES)/Additional/base.make$(END_ECHO) 19 + 20 + # Things to do after installing 21 + # after-install:: 22 + @@ -54,7 +54,7 @@ 23 + 24 + # Things to do after uninstalling 25 + after-uninstall:: 26 + - $(ECHO_NOTHING)rm -f $(DESTDIR)$(GNUSTEP_MAKEFILES)/Additional/base.make$(END_ECHO) 27 + + $(ECHO_NOTHING)rm -f $(DESTDIR_GNUSTEP_MAKEFILES)/Additional/base.make$(END_ECHO) 28 + 29 + # Things to do before cleaning 30 + # before-clean:: 31 + diff -r -u gnustep-base-1.24.7/Source/NSPathUtilities.m gnustep-base-1.24.7.patched/Source/NSPathUtilities.m 32 + --- gnustep-base-1.24.7/Source/NSPathUtilities.m 2014-01-14 13:21:10.000000000 +0600 33 + +++ gnustep-base-1.24.7.patched/Source/NSPathUtilities.m 2015-01-25 13:59:37.000000000 +0600 34 + @@ -153,16 +153,27 @@ 35 + static NSString *gnustepLocalUsersDir = nil; 36 + 37 + static NSString *gnustepSystemApps = nil; 38 + +static NSArray *gnustepSystemAppsNix = nil; 39 + static NSString *gnustepSystemAdminApps = nil; 40 + +static NSArray *gnustepSystemAdminAppsNix = nil; 41 + static NSString *gnustepSystemWebApps = nil; 42 + +static NSArray *gnustepSystemWebAppsNix = nil; 43 + static NSString *gnustepSystemTools = nil; 44 + +static NSArray *gnustepSystemToolsNix = nil; 45 + static NSString *gnustepSystemAdminTools = nil; 46 + +static NSArray *gnustepSystemAdminToolsNix = nil; 47 + static NSString *gnustepSystemLibrary = nil; 48 + +static NSArray *gnustepSystemLibraryNix = nil; 49 + static NSString *gnustepSystemLibraries = nil; 50 + +static NSArray *gnustepSystemLibrariesNix = nil; 51 + static NSString *gnustepSystemHeaders = nil; 52 + +static NSArray *gnustepSystemHeadersNix = nil; 53 + static NSString *gnustepSystemDocumentation = nil; 54 + +static NSArray *gnustepSystemDocumentationNix = nil; 55 + static NSString *gnustepSystemDocumentationInfo = nil; 56 + +static NSArray *gnustepSystemDocumentationInfoNix = nil; 57 + static NSString *gnustepSystemDocumentationMan = nil; 58 + +static NSArray *gnustepSystemDocumentationManNix = nil; 59 + 60 + static NSString *gnustepNetworkApps = nil; 61 + static NSString *gnustepNetworkAdminApps = nil; 62 + @@ -258,6 +269,18 @@ 63 + }\ 64 + }) 65 + 66 + +/* Like ASSIGN_PATH, but permits multiple components in a path 67 + + */ 68 + +#define ASSIGN_PATH_NIX(var, dictionary, key) ({\ 69 + + id val = getPathConfigNix(dictionary, key);\ 70 + + if (val != nil)\ 71 + + {\ 72 + + RELEASE(var);\ 73 + + var = RETAIN(val);\ 74 + + [dictionary removeObjectForKey: key];\ 75 + + }\ 76 + +}) 77 + + 78 + /* Like ASSIGN_PATH(), but permits the result to be a relative path as that 79 + * is what we normally use (the path is within the user's home directory). 80 + */ 81 + @@ -368,7 +391,7 @@ 82 + /* Get a full path string */ 83 + static inline NSString * 84 + getPath(NSString *path) 85 + -{ 86 + +{ 87 + if ([path hasPrefix: @"./"] == YES) 88 + { 89 + path = [gnustepConfigPath stringByAppendingPathComponent: 90 + @@ -383,6 +406,33 @@ 91 + return path; 92 + } 93 + 94 + +static inline NSArray * 95 + +getPathConfigNix(NSDictionary *dict, NSString *key) 96 + +{ 97 + + NSArray *res = nil; 98 + + NSMutableArray *paths = nil; 99 + + NSString *path; 100 + +#if defined(__MINGW_) 101 + + NSString *sep = @";"; 102 + +#else 103 + + NSString *sep = @":"; 104 + +#endif 105 + + 106 + + path = [dict objectForKey: key]; 107 + + if (path != nil) 108 + + { 109 + + if ([path rangeOfString:sep].location != NSNotFound) 110 + + { 111 + + res = [path componentsSeparatedByString:sep]; 112 + + } 113 + + else 114 + + { 115 + + res = [[NSArray alloc] initWithObjects:path, nil]; 116 + + } 117 + + } 118 + + return res; 119 + +} 120 + + 121 + /* Get a full path string from a dictionary */ 122 + static inline NSString * 123 + getPathConfig(NSDictionary *dict, NSString *key) 124 + @@ -468,6 +518,29 @@ 125 + ASSIGN_PATH(gnustepSystemDocumentationInfo, c, 126 + @"GNUSTEP_SYSTEM_DOC_INFO"); 127 + 128 + + ASSIGN_PATH_NIX(gnustepSystemAppsNix, c, 129 + + @"NIX_GNUSTEP_SYSTEM_APPS"); 130 + + ASSIGN_PATH_NIX(gnustepSystemAdminAppsNix, c, 131 + + @"NIX_GNUSTEP_SYSTEM_ADMIN_APPS"); 132 + + ASSIGN_PATH_NIX(gnustepSystemWebAppsNix, c, 133 + + @"NIX_GNUSTEP_SYSTEM_WEB_APPS"); 134 + + ASSIGN_PATH_NIX(gnustepSystemToolsNix, c, 135 + + @"NIX_GNUSTEP_SYSTEM_TOOLS"); 136 + + ASSIGN_PATH_NIX(gnustepSystemAdminToolsNix, c, 137 + + @"NIX_GNUSTEP_SYSTEM_ADMIN_TOOLS"); 138 + + ASSIGN_PATH_NIX(gnustepSystemLibraryNix, c, 139 + + @"NIX_GNUSTEP_SYSTEM_LIBRARY"); 140 + + ASSIGN_PATH_NIX(gnustepSystemLibrariesNix, c, 141 + + @"NIX_GNUSTEP_SYSTEM_LIBRARIES"); 142 + + ASSIGN_PATH_NIX(gnustepSystemHeadersNix, c, 143 + + @"NIX_GNUSTEP_SYSTEM_HEADERS"); 144 + + ASSIGN_PATH_NIX(gnustepSystemDocumentationNix, c, 145 + + @"NIX_GNUSTEP_SYSTEM_DOC"); 146 + + ASSIGN_PATH_NIX(gnustepSystemDocumentationManNix, c, 147 + + @"NIX_GNUSTEP_SYSTEM_DOC_MAN"); 148 + + ASSIGN_PATH_NIX(gnustepSystemDocumentationInfoNix, c, 149 + + @"NIX_GNUSTEP_SYSTEM_DOC_INFO"); 150 + + 151 + ASSIGN_PATH(gnustepNetworkApps, c, 152 + @"GNUSTEP_NETWORK_APPS"); 153 + ASSIGN_PATH(gnustepNetworkAdminApps, c, 154 + @@ -1235,6 +1308,18 @@ 155 + DESTROY(gnustepSystemDocumentationMan); 156 + DESTROY(gnustepSystemDocumentationInfo); 157 + 158 + + DESTROY(gnustepSystemAppsNix); 159 + + DESTROY(gnustepSystemAdminAppsNix); 160 + + DESTROY(gnustepSystemWebAppsNix); 161 + + DESTROY(gnustepSystemToolsNix); 162 + + DESTROY(gnustepSystemAdminToolsNix); 163 + + DESTROY(gnustepSystemLibraryNix); 164 + + DESTROY(gnustepSystemLibrariesNix); 165 + + DESTROY(gnustepSystemHeadersNix); 166 + + DESTROY(gnustepSystemDocumentationNix); 167 + + DESTROY(gnustepSystemDocumentationManNix); 168 + + DESTROY(gnustepSystemDocumentationInfoNix); 169 + + 170 + DESTROY(gnustepNetworkApps); 171 + DESTROY(gnustepNetworkAdminApps); 172 + DESTROY(gnustepNetworkWebApps); 173 + @@ -2183,6 +2268,27 @@ 174 + if ([add_dir length] > 0 && [paths containsObject: add_dir] == NO) \ 175 + [paths addObject: add_dir]; \ 176 + } 177 + +#define ADD_PATH_NIX(mask, base_dirs, add_dir) \ 178 + +if ((domainMask & mask) && (base_dirs != nil)) \ 179 + +{ \ 180 + + NSEnumerator *e = [base_dirs objectEnumerator]; \ 181 + + NSString *dir = nil; \ 182 + + while (dir = [e nextObject]) { \ 183 + + path = [dir stringByAppendingPathComponent: add_dir]; \ 184 + + if ([path length] > 0 && [paths containsObject: path] == NO) \ 185 + + [paths addObject: path]; \ 186 + + } \ 187 + +} 188 + +#define ADD_PLATFORM_PATH_NIX(mask, add_dirs) \ 189 + +if ((domainMask & mask) && (add_dirs != nil)) \ 190 + +{ \ 191 + + NSEnumerator *e = [add_dirs objectEnumerator]; \ 192 + + NSString *dir = nil; \ 193 + + while (dir = [e nextObject]) { \ 194 + + if ([dir length] > 0 && [paths containsObject: dir] == NO) \ 195 + + [paths addObject:dir]; \ 196 + + } \ 197 + +} 198 + 199 + switch (directoryKey) 200 + { 201 + @@ -2191,11 +2297,13 @@ 202 + ADD_PLATFORM_PATH(NSUserDomainMask, gnustepUserApps); 203 + ADD_PLATFORM_PATH(NSLocalDomainMask, gnustepLocalApps); 204 + ADD_PLATFORM_PATH(NSNetworkDomainMask, gnustepNetworkApps); 205 + + ADD_PLATFORM_PATH_NIX(NSSystemDomainMask, gnustepSystemAppsNix); 206 + ADD_PLATFORM_PATH(NSSystemDomainMask, gnustepSystemApps); 207 + 208 + ADD_PLATFORM_PATH(NSUserDomainMask, gnustepUserAdminApps); 209 + ADD_PLATFORM_PATH(NSLocalDomainMask, gnustepLocalAdminApps); 210 + ADD_PLATFORM_PATH(NSNetworkDomainMask, gnustepNetworkAdminApps); 211 + + ADD_PLATFORM_PATH_NIX(NSSystemDomainMask, gnustepSystemAdminAppsNix); 212 + ADD_PLATFORM_PATH(NSSystemDomainMask, gnustepSystemAdminApps); 213 + } 214 + break; 215 + @@ -2205,6 +2313,7 @@ 216 + ADD_PLATFORM_PATH(NSUserDomainMask, gnustepUserApps); 217 + ADD_PLATFORM_PATH(NSLocalDomainMask, gnustepLocalApps); 218 + ADD_PLATFORM_PATH(NSNetworkDomainMask, gnustepNetworkApps); 219 + + ADD_PLATFORM_PATH_NIX(NSSystemDomainMask, gnustepSystemAppsNix); 220 + ADD_PLATFORM_PATH(NSSystemDomainMask, gnustepSystemApps); 221 + } 222 + break; 223 + @@ -2214,6 +2323,7 @@ 224 + ADD_PLATFORM_PATH(NSUserDomainMask, gnustepUserApps); 225 + ADD_PLATFORM_PATH(NSLocalDomainMask, gnustepLocalApps); 226 + ADD_PLATFORM_PATH(NSNetworkDomainMask, gnustepNetworkApps); 227 + + ADD_PLATFORM_PATH_NIX(NSSystemDomainMask, gnustepSystemAppsNix); 228 + ADD_PLATFORM_PATH(NSSystemDomainMask, gnustepSystemApps); 229 + 230 + /* I imagine if ever wanted a separate Demo directory, the 231 + @@ -2231,6 +2341,7 @@ 232 + 233 + case NSCoreServicesDirectory: 234 + { 235 + + ADD_PATH_NIX(NSSystemDomainMask, gnustepSystemLibraryNix, @"CoreServices"); 236 + ADD_PATH(NSSystemDomainMask, gnustepSystemLibrary, @"CoreServices"); 237 + } 238 + break; 239 + @@ -2248,6 +2359,7 @@ 240 + ADD_PLATFORM_PATH(NSUserDomainMask, gnustepUserApps); 241 + ADD_PLATFORM_PATH(NSLocalDomainMask, gnustepLocalApps); 242 + ADD_PLATFORM_PATH(NSNetworkDomainMask, gnustepNetworkApps); 243 + + ADD_PLATFORM_PATH_NIX(NSSystemDomainMask, gnustepSystemAppsNix); 244 + ADD_PLATFORM_PATH(NSSystemDomainMask, gnustepSystemApps); 245 + } 246 + break; 247 + @@ -2257,6 +2369,7 @@ 248 + ADD_PLATFORM_PATH(NSUserDomainMask, gnustepUserAdminApps); 249 + ADD_PLATFORM_PATH(NSLocalDomainMask, gnustepLocalAdminApps); 250 + ADD_PLATFORM_PATH(NSNetworkDomainMask, gnustepNetworkAdminApps); 251 + + ADD_PLATFORM_PATH_NIX(NSSystemDomainMask, gnustepSystemAdminAppsNix); 252 + ADD_PLATFORM_PATH(NSSystemDomainMask, gnustepSystemAdminApps); 253 + } 254 + break; 255 + @@ -2266,6 +2379,7 @@ 256 + ADD_PLATFORM_PATH(NSUserDomainMask, gnustepUserLibrary); 257 + ADD_PLATFORM_PATH(NSLocalDomainMask, gnustepLocalLibrary); 258 + ADD_PLATFORM_PATH(NSNetworkDomainMask, gnustepNetworkLibrary); 259 + + ADD_PLATFORM_PATH_NIX(NSSystemDomainMask, gnustepSystemLibraryNix); 260 + ADD_PLATFORM_PATH(NSSystemDomainMask, gnustepSystemLibrary); 261 + } 262 + break; 263 + @@ -2281,6 +2395,7 @@ 264 + ADD_PLATFORM_PATH(NSUserDomainMask, gnustepUserLibrary); 265 + ADD_PLATFORM_PATH(NSLocalDomainMask, gnustepLocalLibrary); 266 + ADD_PLATFORM_PATH(NSNetworkDomainMask, gnustepNetworkLibrary); 267 + + ADD_PLATFORM_PATH_NIX(NSSystemDomainMask, gnustepSystemLibraryNix); 268 + ADD_PLATFORM_PATH(NSSystemDomainMask, gnustepSystemLibrary); 269 + } 270 + break; 271 + @@ -2418,6 +2533,7 @@ 272 + ADD_PLATFORM_PATH(NSUserDomainMask, gnustepUserDocumentation); 273 + ADD_PLATFORM_PATH(NSLocalDomainMask, gnustepLocalDocumentation); 274 + ADD_PLATFORM_PATH(NSNetworkDomainMask, gnustepNetworkDocumentation); 275 + + ADD_PLATFORM_PATH_NIX(NSSystemDomainMask, gnustepSystemDocumentationNix); 276 + ADD_PLATFORM_PATH(NSSystemDomainMask, gnustepSystemDocumentation); 277 + } 278 + break; 279 + @@ -2449,6 +2565,7 @@ 280 + ADD_PATH(NSUserDomainMask, gnustepUserLibrary, @"Caches"); 281 + ADD_PATH(NSLocalDomainMask, gnustepLocalLibrary, @"Caches"); 282 + ADD_PATH(NSNetworkDomainMask, gnustepNetworkLibrary, @"Caches"); 283 + + ADD_PATH_NIX(NSSystemDomainMask, gnustepSystemLibraryNix, @"Caches"); 284 + ADD_PATH(NSSystemDomainMask, gnustepSystemLibrary, @"Caches"); 285 + } 286 + break; 287 + @@ -2460,6 +2577,8 @@ 288 + @"ApplicationSupport"); 289 + ADD_PATH(NSNetworkDomainMask, gnustepNetworkLibrary, 290 + @"ApplicationSupport"); 291 + + ADD_PATH_NIX(NSSystemDomainMask, gnustepSystemLibraryNix, 292 + + @"ApplicationSupport"); 293 + ADD_PATH(NSSystemDomainMask, gnustepSystemLibrary, 294 + @"ApplicationSupport"); 295 + } 296 + @@ -2471,6 +2590,7 @@ 297 + ADD_PATH(NSUserDomainMask, gnustepUserLibrary, @"Frameworks"); 298 + ADD_PATH(NSLocalDomainMask, gnustepLocalLibrary, @"Frameworks"); 299 + ADD_PATH(NSNetworkDomainMask, gnustepNetworkLibrary, @"Frameworks"); 300 + + ADD_PATH_NIX(NSSystemDomainMask, gnustepSystemLibraryNix, @"Frameworks"); 301 + ADD_PATH(NSSystemDomainMask, gnustepSystemLibrary, @"Frameworks"); 302 + } 303 + break; 304 + @@ -2480,6 +2600,7 @@ 305 + ADD_PATH(NSUserDomainMask, gnustepUserLibrary, @"Fonts"); 306 + ADD_PATH(NSLocalDomainMask, gnustepLocalLibrary, @"Fonts"); 307 + ADD_PATH(NSNetworkDomainMask, gnustepNetworkLibrary, @"Fonts"); 308 + + ADD_PATH_NIX(NSSystemDomainMask, gnustepSystemLibraryNix, @"Fonts"); 309 + ADD_PATH(NSSystemDomainMask, gnustepSystemLibrary, @"Fonts"); 310 + } 311 + break; 312 + @@ -2518,6 +2639,12 @@ 313 + if (part) 314 + ADD_PATH(NSNetworkDomainMask, gnustepNetworkLibraries, part); 315 + 316 + + ADD_PLATFORM_PATH_NIX(NSSystemDomainMask, gnustepSystemLibrariesNix); 317 + + if (full) 318 + + ADD_PATH_NIX(NSSystemDomainMask, gnustepSystemLibrariesNix, full); 319 + + if (part) 320 + + ADD_PATH_NIX(NSSystemDomainMask, gnustepSystemLibrariesNix, part); 321 + + 322 + ADD_PLATFORM_PATH(NSSystemDomainMask, gnustepSystemLibraries); 323 + if (full) 324 + ADD_PATH(NSSystemDomainMask, gnustepSystemLibraries, full); 325 + @@ -2560,6 +2687,12 @@ 326 + if (part) 327 + ADD_PATH(NSNetworkDomainMask, gnustepNetworkTools, part); 328 + 329 + + ADD_PLATFORM_PATH_NIX(NSSystemDomainMask, gnustepSystemToolsNix); 330 + + if (full) 331 + + ADD_PATH_NIX(NSSystemDomainMask, gnustepSystemToolsNix, full); 332 + + if (part) 333 + + ADD_PATH_NIX(NSSystemDomainMask, gnustepSystemToolsNix, part); 334 + + 335 + ADD_PLATFORM_PATH(NSSystemDomainMask, gnustepSystemTools); 336 + if (full) 337 + ADD_PATH(NSSystemDomainMask, gnustepSystemTools, full); 338 + @@ -2602,6 +2735,18 @@ 339 + if (part) 340 + ADD_PATH(NSNetworkDomainMask, gnustepNetworkAdminTools, part); 341 + 342 + + ADD_PLATFORM_PATH_NIX(NSSystemDomainMask, gnustepSystemAdminToolsNix); 343 + + if (full) 344 + + ADD_PATH_NIX(NSSystemDomainMask, gnustepSystemAdminToolsNix, full); 345 + + if (part) 346 + + ADD_PATH_NIX(NSSystemDomainMask, gnustepSystemAdminToolsNix, part); 347 + + 348 + + ADD_PLATFORM_PATH_NIX(NSSystemDomainMask, gnustepSystemAdminToolsNix); 349 + + if (full) 350 + + ADD_PATH_NIX(NSSystemDomainMask, gnustepSystemAdminToolsNix, full); 351 + + if (part) 352 + + ADD_PATH_NIX(NSSystemDomainMask, gnustepSystemAdminToolsNix, part); 353 + + 354 + ADD_PLATFORM_PATH(NSSystemDomainMask, gnustepSystemAdminTools); 355 + if (full) 356 + ADD_PATH(NSSystemDomainMask, gnustepSystemAdminTools, full); 357 + @@ -2615,6 +2760,7 @@ 358 + ADD_PLATFORM_PATH(NSUserDomainMask, gnustepUserWebApps); 359 + ADD_PLATFORM_PATH(NSLocalDomainMask, gnustepLocalWebApps); 360 + ADD_PLATFORM_PATH(NSNetworkDomainMask, gnustepNetworkWebApps); 361 + + ADD_PLATFORM_PATH_NIX(NSSystemDomainMask, gnustepSystemWebAppsNix); 362 + ADD_PLATFORM_PATH(NSSystemDomainMask, gnustepSystemWebApps); 363 + } 364 + break; 365 + @@ -2622,6 +2768,8 @@ 366 + 367 + #undef ADD_PATH 368 + #undef ADD_PLATFORM_PATH 369 + +#undef ADD_PATH_NIX 370 + +#undef ADD_PLATFORM_PATH_NIX 371 + 372 + count = [paths count]; 373 + for (i = 0; i < count; i++)

+21

pkgs/desktops/gnustep/default.nix

··· 1 + { pkgs, newScope }: 2 + 3 + let 4 + callPackage = newScope self; 5 + 6 + self = rec { 7 + stdenv = pkgs.clangStdenv; 8 + 9 + gsmakeDerivation = callPackage ./make/gsmakeDerivation.nix {}; 10 + gorm = callPackage ./gorm {}; 11 + projectcenter = callPackage ./projectcenter {}; 12 + system_preferences = callPackage ./systempreferences {}; 13 + libobjc = callPackage ./libobjc2 {}; 14 + make = callPackage ./make {}; 15 + back = callPackage ./back {}; 16 + base = callPackage ./base { giflib = pkgs.giflib_4_1; }; 17 + gui = callPackage ./gui {}; 18 + gworkspace = callPackage ./gworkspace {}; 19 + }; 20 + 21 + in self

+17

pkgs/desktops/gnustep/gorm/default.nix

··· 1 + { fetchurl, base, back, gsmakeDerivation, gui }: 2 + let 3 + version = "1.2.22"; 4 + in 5 + gsmakeDerivation { 6 + name = "gorm-${version}"; 7 + 8 + src = fetchurl { 9 + url = "ftp://ftp.gnustep.org/pub/gnustep/dev-apps/gorm-${version}.tar.gz"; 10 + sha256 = "1mq5n65xd9bc4kppx19iijsgpz4crvhg7bfwbi9k78j159vclnmi"; 11 + }; 12 + buildInputs = [ base back gui ]; 13 + 14 + meta = { 15 + description = "Graphical Object Relationship Modeller is an easy-to-use interface designer for GNUstep"; 16 + }; 17 + }

+27

pkgs/desktops/gnustep/gorm/fix-gs-makefiles.patch

··· 1 + diff -ru gorm-1.2.20/GNUmakefile gorm-1.2.20.patched/GNUmakefile 2 + --- gorm-1.2.20/GNUmakefile 2010-05-30 12:55:26.000000000 +0600 3 + +++ gorm-1.2.20.patched/GNUmakefile 2014-12-10 22:21:18.000000000 +0600 4 + @@ -24,6 +24,23 @@ 5 + # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 6 + # 7 + 8 + +ifeq ($(GNUSTEP_MAKEFILES),) 9 + + GNUSTEP_MAKEFILES := $(shell gnustep-config --variable=GNUSTEP_MAKEFILES 2>/dev/null) 10 + + ifeq ($(GNUSTEP_MAKEFILES),) 11 + + $(warning ) 12 + + $(warning Unable to obtain GNUSTEP_MAKEFILES setting from gnustep-config!) 13 + + $(warning Perhaps gnustep-make is not properly installed,) 14 + + $(warning so gnustep-config is not in your PATH.) 15 + + $(warning ) 16 + + $(warning Your PATH is currently $(PATH)) 17 + + $(warning ) 18 + + endif 19 + +endif 20 + + 21 + +ifeq ($(GNUSTEP_MAKEFILES),) 22 + + $(error You need to set GNUSTEP_MAKEFILES before compiling!) 23 + +endif 24 + + 25 + PACKAGE_NAME = gorm 26 + export PACKAGE_NAME 27 + include $(GNUSTEP_MAKEFILES)/common.make

+16

pkgs/desktops/gnustep/gui/default.nix

··· 1 + { gsmakeDerivation, fetchurl, base }: 2 + let 3 + version = "0.25.0"; 4 + in 5 + gsmakeDerivation { 6 + name = "gnustep-gui-${version}"; 7 + src = fetchurl { 8 + url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-gui-${version}.tar.gz"; 9 + sha256 = "10jf3xir59qzbhhl0bvs9wdw40fsmvv6mdv5akdkia1rnck60xf5"; 10 + }; 11 + buildInputs = [ base ]; 12 + patches = [ ./fixup-all.patch ]; 13 + meta = { 14 + description = "A GUI class library of GNUstep"; 15 + }; 16 + }

+56

pkgs/desktops/gnustep/gui/fixup-all.patch

··· 1 + diff -r -u gnustep-gui-0.24.0/GNUmakefile.postamble gnustep-gui-0.24.0.patched/GNUmakefile.postamble 2 + --- gnustep-gui-0.24.0/GNUmakefile.postamble 2010-05-17 22:38:59.000000000 +0600 3 + +++ gnustep-gui-0.24.0.patched/GNUmakefile.postamble 2014-12-01 13:44:05.000000000 +0600 4 + @@ -40,20 +40,20 @@ 5 + # The following rule is important mainly for packaging, because in that case 6 + # you install into a fake system tree, and the directory is not there. 7 + # 8 + -$(DESTDIR)$(GNUSTEP_MAKEFILES)/Additional: 9 + - $(MKDIRS) $(DESTDIR)$(GNUSTEP_MAKEFILES)/Additional 10 + +$(DESTDIR_GNUSTEP_MAKEFILES)/Additional: 11 + + $(MKDIRS) $(DESTDIR_GNUSTEP_MAKEFILES)/Additional 12 + 13 + # Things to do before installing 14 + -before-install:: $(DESTDIR)$(GNUSTEP_MAKEFILES)/Additional 15 + +before-install:: $(DESTDIR_GNUSTEP_MAKEFILES)/Additional 16 + $(INSTALL_DATA) gui.make \ 17 + - $(DESTDIR)$(GNUSTEP_MAKEFILES)/Additional/gui.make 18 + + $(DESTDIR_GNUSTEP_MAKEFILES)/Additional/gui.make 19 + 20 + # Things to do after installing 21 + # after-install:: 22 + 23 + # Things to do before uninstalling 24 + before-uninstall:: 25 + - rm -f $(DESTDIR)$(GNUSTEP_MAKEFILES)/Additional/gui.make 26 + + rm -f $(DESTDIR_GNUSTEP_MAKEFILES)/Additional/gui.make 27 + 28 + # Things to do after uninstalling 29 + # after-uninstall:: 30 + diff -r -u gnustep-gui-0.24.0/TextConverters/RTF/GNUmakefile.preamble gnustep-gui-0.24.0.patched/TextConverters/RTF/GNUmakefile.preamble 31 + --- gnustep-gui-0.24.0/TextConverters/RTF/GNUmakefile.preamble 2008-06-10 10:01:49.000000000 +0600 32 + +++ gnustep-gui-0.24.0.patched/TextConverters/RTF/GNUmakefile.preamble 2014-12-01 13:02:11.000000000 +0600 33 + @@ -49,7 +49,7 @@ 34 + ADDITIONAL_INCLUDE_DIRS +=-I../../Headers/Additions -I../../Headers 35 + 36 + # Additional LDFLAGS to pass to the linker 37 + -#ADDITIONAL_LDFLAGS += 38 + +ADDITIONAL_LDFLAGS += -lgnustep-gui 39 + 40 + # Additional library directories the linker should search 41 + ADDITIONAL_LIB_DIRS += -L../../Source/$(GNUSTEP_OBJ_DIR) 42 + diff -r -u gnustep-gui-0.24.0/Tools/GNUmakefile.preamble gnustep-gui-0.24.0.patched/Tools/GNUmakefile.preamble 43 + --- gnustep-gui-0.24.0/Tools/GNUmakefile.preamble 2006-02-22 12:43:48.000000000 +0600 44 + +++ gnustep-gui-0.24.0.patched/Tools/GNUmakefile.preamble 2014-12-01 12:52:41.000000000 +0600 45 + @@ -32,9 +32,11 @@ 46 + ADDITIONAL_LIB_DIRS += -L../Source/$(GNUSTEP_OBJ_DIR) -L../Model/$(GNUSTEP_OBJ_DIR) 47 + 48 + # Additional libraries when linking tools 49 + +make_services_TOOL_LIBS += -lgnustep-base 50 + gpbs_TOOL_LIBS += -lgnustep-gui $(SYSTEM_LIBS) 51 + set_show_service_TOOL_LIBS += -lgnustep-gui $(SYSTEM_LIBS) 52 + gopen_TOOL_LIBS += -lgnustep-gui $(SYSTEM_LIBS) 53 + +gclose_TOOL_LIBS += -lgnustep-base 54 + gcloseall_TOOL_LIBS += -lgnustep-gui $(SYSTEM_LIBS) 55 + GSspell_TOOL_LIBS += $(ADDITIONAL_DEPENDS) 56 +

+28

pkgs/desktops/gnustep/gui/fixup-gui-makefile-installdir.patch

··· 1 + --- gnustep-gui-0.24.0/GNUmakefile.postamble 2010-05-17 22:38:59.000000000 +0600 2 + +++ gnustep-gui-0.24.0.patched/GNUmakefile.postamble 2014-12-01 13:44:05.000000000 +0600 3 + @@ -40,20 +40,20 @@ 4 + # The following rule is important mainly for packaging, because in that case 5 + # you install into a fake system tree, and the directory is not there. 6 + # 7 + -$(DESTDIR)$(GNUSTEP_MAKEFILES)/Additional: 8 + - $(MKDIRS) $(DESTDIR)$(GNUSTEP_MAKEFILES)/Additional 9 + +$(DESTDIR_GNUSTEP_MAKEFILES)/Additional: 10 + + $(MKDIRS) $(DESTDIR_GNUSTEP_MAKEFILES)/Additional 11 + 12 + # Things to do before installing 13 + -before-install:: $(DESTDIR)$(GNUSTEP_MAKEFILES)/Additional 14 + +before-install:: $(DESTDIR_GNUSTEP_MAKEFILES)/Additional 15 + $(INSTALL_DATA) gui.make \ 16 + - $(DESTDIR)$(GNUSTEP_MAKEFILES)/Additional/gui.make 17 + + $(DESTDIR_GNUSTEP_MAKEFILES)/Additional/gui.make 18 + 19 + # Things to do after installing 20 + # after-install:: 21 + 22 + # Things to do before uninstalling 23 + before-uninstall:: 24 + - rm -f $(DESTDIR)$(GNUSTEP_MAKEFILES)/Additional/gui.make 25 + + rm -f $(DESTDIR_GNUSTEP_MAKEFILES)/Additional/gui.make 26 + 27 + # Things to do after uninstalling 28 + # after-uninstall::

+11

pkgs/desktops/gnustep/gui/fixup-gui-textconverters-preamble.patch

··· 1 + --- gnustep-gui-0.24.0/TextConverters/RTF/GNUmakefile.preamble 2008-06-10 10:01:49.000000000 +0600 2 + +++ gnustep-gui-0.24.0.patched/TextConverters/RTF/GNUmakefile.preamble 2014-12-01 13:02:11.000000000 +0600 3 + @@ -49,7 +49,7 @@ 4 + ADDITIONAL_INCLUDE_DIRS +=-I../../Headers/Additions -I../../Headers 5 + 6 + # Additional LDFLAGS to pass to the linker 7 + -#ADDITIONAL_LDFLAGS += 8 + +ADDITIONAL_LDFLAGS += -lgnustep-gui 9 + 10 + # Additional library directories the linker should search 11 + ADDITIONAL_LIB_DIRS += -L../../Source/$(GNUSTEP_OBJ_DIR)

+14

pkgs/desktops/gnustep/gui/fixup-gui-tools-preamble.patch

··· 1 + --- gnustep-gui-0.24.0/Tools/GNUmakefile.preamble 2006-02-22 12:43:48.000000000 +0600 2 + +++ gnustep-gui-0.24.0.patched/Tools/GNUmakefile.preamble 2014-12-01 12:52:41.000000000 +0600 3 + @@ -32,9 +32,11 @@ 4 + ADDITIONAL_LIB_DIRS += -L../Source/$(GNUSTEP_OBJ_DIR) -L../Model/$(GNUSTEP_OBJ_DIR) 5 + 6 + # Additional libraries when linking tools 7 + +make_services_TOOL_LIBS += -lgnustep-base 8 + gpbs_TOOL_LIBS += -lgnustep-gui $(SYSTEM_LIBS) 9 + set_show_service_TOOL_LIBS += -lgnustep-gui $(SYSTEM_LIBS) 10 + gopen_TOOL_LIBS += -lgnustep-gui $(SYSTEM_LIBS) 11 + +gclose_TOOL_LIBS += -lgnustep-base 12 + gcloseall_TOOL_LIBS += -lgnustep-gui $(SYSTEM_LIBS) 13 + GSspell_TOOL_LIBS += $(ADDITIONAL_DEPENDS) 14 +

+23

pkgs/desktops/gnustep/gworkspace/default.nix

··· 1 + { back, base, gui, gsmakeDerivation 2 + , fetchurl 3 + , sqlite 4 + , system_preferences 5 + }: 6 + let 7 + version = "0.9.3"; 8 + in 9 + gsmakeDerivation { 10 + name = "gworkspace-${version}"; 11 + src = fetchurl { 12 + url = "ftp://ftp.gnustep.org/pub/gnustep/usr-apps/gworkspace-${version}.tar.gz"; 13 + sha256 = "0jchqwb0dj522j98jqlqlib44jppax39zx2zqyzdwiz4qjl470r3"; 14 + }; 15 + # additional dependencies: 16 + # - PDFKit framework from http://gap.nongnu.org/ 17 + # - TODO: to --enable-gwmetadata, need libDBKit as well as sqlite! 18 + buildInputs = [ back base gui system_preferences ]; 19 + configureFlags = [ "--with-inotify" ]; 20 + meta = { 21 + description = "A workspace manager for GNUstep"; 22 + }; 23 + }

+28

pkgs/desktops/gnustep/libobjc2/default.nix

··· 1 + { stdenv, lib, fetchFromGitHub, cmake }: 2 + 3 + let 4 + version = "1.8.1"; 5 + in 6 + 7 + stdenv.mkDerivation rec { 8 + name = "libobjc2-${version}"; 9 + 10 + src = fetchFromGitHub { 11 + owner = "gnustep"; 12 + repo = "libobjc2"; 13 + rev = "v${version}"; 14 + sha256 = "12v9pjg97h56mb114cqd22q1pdwhmxrgdw5hal74ddlrhiq1nzvi"; 15 + }; 16 + 17 + buildInputs = [ cmake ]; 18 + 19 + cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ]; 20 + 21 + meta = with lib; { 22 + description = "Objective-C runtime for use with GNUstep"; 23 + homepage = http://gnustep.org/; 24 + license = licenses.mit; 25 + maintainers = with maintainers; [ ashalkhakov matthewbauer ]; 26 + platforms = platforms.unix; 27 + }; 28 + }

+126

pkgs/desktops/gnustep/make/GNUstep.conf

··· 1 + # These GNUSTEP_*_ROOT variables are obsolete, and will be removed. 2 + #GNUSTEP_SYSTEM_ROOT=/nix/store/ky64z3j9l18wjcssb9pxnc792ihh3bvw-gnustep-make-2.6.6/System 3 + #GNUSTEP_LOCAL_ROOT=/nix/store/ky64z3j9l18wjcssb9pxnc792ihh3bvw-gnustep-make-2.6.6/Local 4 + #GNUSTEP_NETWORK_ROOT=/nix/store/ky64z3j9l18wjcssb9pxnc792ihh3bvw-gnustep-make-2.6.6/Network 5 + 6 + # The name of the user config file. This file can override 7 + # some settings in this file. Usually used by users that want 8 + # to install things into their GNUstep user domain and/or have 9 + # many such domains. 10 + GNUSTEP_USER_CONFIG_FILE=.GNUstep.conf 11 + 12 + # The name of the user directory, if any. This is obsolete, 13 + # and will be removed. 14 + GNUSTEP_USER_DIR=GNUstep 15 + 16 + # The name of the user directory where defaults (eg, preferences) are 17 + # stored. If it does not start with a '/', it will be considered 18 + # relative to the user home directory. 19 + GNUSTEP_USER_DEFAULTS_DIR=GNUstep/Defaults 20 + 21 + 22 + # This is where the gnustep-make Makefiles are installed. 23 + # Traditionally, this is /usr/GNUstep/System/Library/Makefiles 24 + GNUSTEP_MAKEFILES=@gnustepMakefiles@ 25 + 26 + # This is where the user home directories are. Only used to provide 27 + # NSUserDirectory in gnustep-base. Never used anywhere else. 28 + GNUSTEP_SYSTEM_USERS_DIR=/home 29 + GNUSTEP_NETWORK_USERS_DIR=/home 30 + GNUSTEP_LOCAL_USERS_DIR=/home 31 + 32 + 33 + # This is where System GUI Applications get installed. 34 + # Traditionally it is /usr/GNUstep/System/Applications. 35 + GNUSTEP_SYSTEM_APPS=@systemApps@ 36 + 37 + # This is where System GUI Applications that only the 38 + # Administrator can use get installed. 39 + # Traditionally it is /usr/GNUstep/System/Applications/Admin. 40 + GNUSTEP_SYSTEM_ADMIN_APPS=@systemAdminApps@ 41 + 42 + # This is where System Web Applications (GSWeb, SOPE) get 43 + # installed. 44 + # Traditionally it is /usr/GNUstep/System/Library/WebApplications. 45 + GNUSTEP_SYSTEM_WEB_APPS=@systemWebApps@ 46 + 47 + # This is where System Command-Line Tools get installed. 48 + # Traditionally it is /usr/GNUstep/System/Tools. 49 + GNUSTEP_SYSTEM_TOOLS=@systemTools@ 50 + 51 + # This is where System Command-Line Tools that only the 52 + # Administrator can use get installed. Important: this 53 + # should not be in the PATH of normal users. 54 + # Traditionally it is /usr/GNUstep/System/Tools/Admin. 55 + GNUSTEP_SYSTEM_ADMIN_TOOLS=@systemAdminTools@ 56 + 57 + # This is where System resources get installed. This directory will 58 + # contain a lot of executable code since *step traditionally likes to 59 + # bundle executables and resources together. 60 + # Traditionally it is /usr/GNUstep/System/Library. 61 + GNUSTEP_SYSTEM_LIBRARY=@systemLibrary@ 62 + 63 + # This is where System headers get installed. They are the 64 + # library .h headers. 65 + # Traditionally it is /usr/GNUstep/System/Library/Headers. 66 + GNUSTEP_SYSTEM_HEADERS=@systemHeaders@ 67 + 68 + # This is where System libraries get installed. By libraries we mean 69 + # the shared/static object files that you can link into programs. 70 + # Traditionally it is /usr/GNUstep/System/Library/Libraries. 71 + GNUSTEP_SYSTEM_LIBRARIES=@systemLibraries@ 72 + 73 + # This is where System documentation get installed. This is known 74 + # not to contain any executable, so we keep it separate. 75 + # Traditionally it is /usr/GNUstep/System/Library/Documentation. 76 + GNUSTEP_SYSTEM_DOC=@systemDoc@ 77 + 78 + # This is where System man pages get installed. 79 + # Traditionally it is /usr/GNUstep/System/Library/Documentation/man. 80 + GNUSTEP_SYSTEM_DOC_MAN=@systemDocMan@ 81 + 82 + # This is where System info pages get installed. 83 + # Traditionally it is /usr/GNUstep/System/Library/Documentation/info. 84 + GNUSTEP_SYSTEM_DOC_INFO=@systemDocInfo@ 85 + 86 + 87 + GNUSTEP_NETWORK_APPS=@systemApps@ 88 + GNUSTEP_NETWORK_ADMIN_APPS=@systemAdminApps@ 89 + GNUSTEP_NETWORK_WEB_APPS=@systemWebApps@ 90 + GNUSTEP_NETWORK_TOOLS=@systemTools@ 91 + GNUSTEP_NETWORK_ADMIN_TOOLS=@systemAdminTools@ 92 + GNUSTEP_NETWORK_LIBRARY=@systemLibrary@ 93 + GNUSTEP_NETWORK_HEADERS=@systemHeaders@ 94 + GNUSTEP_NETWORK_LIBRARIES=@systemLibraries@ 95 + GNUSTEP_NETWORK_DOC=@systemDoc@ 96 + GNUSTEP_NETWORK_DOC_MAN=@systemDocMan@ 97 + GNUSTEP_NETWORK_DOC_INFO=@systemDocInfo@ 98 + 99 + GNUSTEP_LOCAL_APPS=@systemApps@ 100 + GNUSTEP_LOCAL_ADMIN_APPS=@systemAdminApps@ 101 + GNUSTEP_LOCAL_WEB_APPS=@systemWebApps@ 102 + GNUSTEP_LOCAL_TOOLS=@systemTools@ 103 + GNUSTEP_LOCAL_ADMIN_TOOLS=@systemAdminTools@ 104 + GNUSTEP_LOCAL_LIBRARY=@systemLibrary@ 105 + GNUSTEP_LOCAL_HEADERS=@systemHeaders@ 106 + GNUSTEP_LOCAL_LIBRARIES=@systemLibraries@ 107 + GNUSTEP_LOCAL_DOC=@systemDoc@ 108 + GNUSTEP_LOCAL_DOC_MAN=@systemDocMan@ 109 + GNUSTEP_LOCAL_DOC_INFO=@systemDocInfo@ 110 + 111 + # Important: settings in the User should normally be relative paths, 112 + # and will be interpreted as relative to the user's directory. This 113 + # allows each user to have their own domain to install things. You 114 + # can set them to be absolute, mostly if you want to disable them 115 + # by setting them equal to the ones in the Network domain. 116 + GNUSTEP_USER_DIR_APPS=GNUstep/Applications 117 + GNUSTEP_USER_DIR_ADMIN_APPS=GNUstep/Applications/Admin 118 + GNUSTEP_USER_DIR_WEB_APPS=GNUstep/WebApplications 119 + GNUSTEP_USER_DIR_TOOLS=GNUstep/Tools 120 + GNUSTEP_USER_DIR_ADMIN_TOOLS=GNUstep/Tools/Admin 121 + GNUSTEP_USER_DIR_LIBRARY=GNUstep/Library 122 + GNUSTEP_USER_DIR_HEADERS=GNUstep/Library/Headers 123 + GNUSTEP_USER_DIR_LIBRARIES=GNUstep/Library/Libraries 124 + GNUSTEP_USER_DIR_DOC=GNUstep/Library/Documentation 125 + GNUSTEP_USER_DIR_DOC_MAN=GNUstep/Library/Documentation/man 126 + GNUSTEP_USER_DIR_DOC_INFO=GNUstep/Library/Documentation/info

+122

pkgs/desktops/gnustep/make/builder.sh

··· 1 + source $stdenv/setup 2 + 3 + preConfigure() { 4 + . $GNUSTEP_MAKEFILES/GNUstep.sh 5 + } 6 + 7 + wrapGSMake() { 8 + local program="$1" 9 + local config="$2" 10 + local wrapped="$(dirname $program)/.$(basename $program)-wrapped" 11 + 12 + mv "$program" "$wrapped" 13 + 14 + cat > "$program"<<EOF 15 + #! $SHELL -e 16 + 17 + export GNUSTEP_CONFIG_FILE="$config" 18 + 19 + exec "$wrapped" "\$@" "\${extraFlagsArray[@]}" 20 + EOF 21 + chmod +x "$program" 22 + } 23 + 24 + postInstall() { 25 + local conf="$out/share/.GNUstep.conf" 26 + 27 + mkdir -p "$out/share" 28 + touch $conf 29 + 30 + # add the current package to the paths 31 + local tmp="$out/lib/GNUstep/Applications" 32 + if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_APPS" in *"${tmp}"*) false;; *) true;; esac; then 33 + addToSearchPath NIX_GNUSTEP_SYSTEM_APPS "$tmp" 34 + fi 35 + tmp="$out/lib/GNUstep/Applications" 36 + if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_ADMIN_APPS" in *"${tmp}"*) false;; *) true;; esac; then 37 + addToSearchPath NIX_GNUSTEP_SYSTEM_ADMIN_APPS "$tmp" 38 + fi 39 + tmp="$out/lib/GNUstep/WebApplications" 40 + if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_WEB_APPS" in *"${tmp}"*) false;; *) true;; esac; then 41 + addToSearchPath NIX_GNUSTEP_SYSTEM_WEB_APPS "$tmp" 42 + fi 43 + tmp="$out/bin" 44 + if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_TOOLS" in *"${tmp}"*) false;; *) true;; esac; then 45 + addToSearchPath NIX_GNUSTEP_SYSTEM_TOOLS "$tmp" 46 + fi 47 + tmp="$out/sbin" 48 + if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_ADMIN_TOOLS" in *"${tmp}"*) false;; *) true;; esac; then 49 + addToSearchPath NIX_GNUSTEP_SYSTEM_ADMIN_TOOLS "$tmp" 50 + fi 51 + tmp="$out/lib/GNUstep" 52 + if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_LIBRARY" in *"${tmp}"*) false;; *) true;; esac; then 53 + addToSearchPath NIX_GNUSTEP_SYSTEM_LIBRARY "$tmp" 54 + fi 55 + tmp="$out/include" 56 + if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_HEADERS" in *"${tmp}"*) false;; *) true;; esac; then 57 + if [ -z "$NIX_GNUSTEP_SYSTEM_HEADERS" ]; then 58 + export NIX_GNUSTEP_SYSTEM_HEADERS="$tmp" 59 + else 60 + export NIX_GNUSTEP_SYSTEM_HEADERS+=" $tmp" 61 + fi 62 + fi 63 + tmp="$out/lib" 64 + if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_LIBRARIES" in *"${tmp}"*) false;; *) true;; esac; then 65 + addToSearchPath NIX_GNUSTEP_SYSTEM_LIBRARIES "$tmp" 66 + fi 67 + tmp="$out/share/GNUstep/Documentation" 68 + if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_DOC" in *"${tmp}"*) false;; *) true;; esac; then 69 + addToSearchPath NIX_GNUSTEP_SYSTEM_DOC "$tmp" 70 + fi 71 + tmp="$out/share/man" 72 + if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_DOC_MAN" in *"${tmp}"*) false;; *) true;; esac; then 73 + addToSearchPath NIX_GNUSTEP_SYSTEM_DOC_MAN "$tmp" 74 + fi 75 + tmp="$out/share/info" 76 + if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_DOC_INFO" in *"${tmp}"*) false;; *) true;; esac; then 77 + addToSearchPath NIX_GNUSTEP_SYSTEM_DOC_INFO "$tmp" 78 + fi 79 + 80 + # write the config file 81 + echo GNUSTEP_MAKEFILES=$GNUSTEP_MAKEFILES >> $conf 82 + if [ -n "$NIX_GNUSTEP_SYSTEM_APPS" ]; then 83 + echo NIX_GNUSTEP_SYSTEM_APPS="$NIX_GNUSTEP_SYSTEM_APPS" 84 + fi 85 + if [ -n "$NIX_GNUSTEP_SYSTEM_ADMIN_APPS" ]; then 86 + echo NIX_GNUSTEP_SYSTEM_ADMIN_APPS="$NIX_GNUSTEP_SYSTEM_ADMIN_APPS" >> $conf 87 + fi 88 + if [ -n "$NIX_GNUSTEP_SYSTEM_WEB_APPS" ]; then 89 + echo NIX_GNUSTEP_SYSTEM_WEB_APPS="$NIX_GNUSTEP_SYSTEM_WEB_APPS" >> $conf 90 + fi 91 + if [ -n "$NIX_GNUSTEP_SYSTEM_TOOLS" ]; then 92 + echo NIX_GNUSTEP_SYSTEM_TOOLS="$NIX_GNUSTEP_SYSTEM_TOOLS" >> $conf 93 + fi 94 + if [ -n "$NIX_GNUSTEP_SYSTEM_ADMIN_TOOLS" ]; then 95 + echo NIX_GNUSTEP_SYSTEM_ADMIN_TOOLS="$NIX_GNUSTEP_SYSTEM_ADMIN_TOOLS" >> $conf 96 + fi 97 + if [ -n "$NIX_GNUSTEP_SYSTEM_LIBRARY" ]; then 98 + echo NIX_GNUSTEP_SYSTEM_LIBRARY="$NIX_GNUSTEP_SYSTEM_LIBRARY" >> $conf 99 + fi 100 + if [ -n "$NIX_GNUSTEP_SYSTEM_HEADERS" ]; then 101 + echo NIX_GNUSTEP_SYSTEM_HEADERS="$NIX_GNUSTEP_SYSTEM_HEADERS" >> $conf 102 + fi 103 + if [ -n "$NIX_GNUSTEP_SYSTEM_LIBRARIES" ]; then 104 + echo NIX_GNUSTEP_SYSTEM_LIBRARIES="$NIX_GNUSTEP_SYSTEM_LIBRARIES" >> $conf 105 + fi 106 + if [ -n "$NIX_GNUSTEP_SYSTEM_DOC" ]; then 107 + echo NIX_GNUSTEP_SYSTEM_DOC="$NIX_GNUSTEP_SYSTEM_DOC" >> $conf 108 + fi 109 + if [ -n "$NIX_GNUSTEP_SYSTEM_DOC_MAN" ]; then 110 + echo NIX_GNUSTEP_SYSTEM_DOC_MAN="$NIX_GNUSTEP_SYSTEM_DOC_MAN" >> $conf 111 + fi 112 + if [ -n "$NIX_GNUSTEP_SYSTEM_DOC_INFO" ]; then 113 + echo NIX_GNUSTEP_SYSTEM_DOC_INFO="$NIX_GNUSTEP_SYSTEM_DOC_INFO" >> $conf 114 + fi 115 + 116 + for i in $out/bin/*; do 117 + echo "wrapping $(basename $i)" 118 + wrapGSMake "$i" "$out/share/.GNUstep.conf" 119 + done 120 + } 121 + 122 + genericBuild

+38

pkgs/desktops/gnustep/make/default.nix

··· 1 + { stdenv, fetchurl, clang, which, libobjc }: 2 + 3 + let 4 + version = "2.6.8"; 5 + in 6 + 7 + stdenv.mkDerivation rec { 8 + name = "gnustep-make-${version}"; 9 + 10 + src = fetchurl { 11 + url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-make-${version}.tar.gz"; 12 + sha256 = "0r00439f7vrggdwv60n8p626gnyymhq968i5x9ad2i4v6g8x4gk0"; 13 + }; 14 + 15 + configureFlags = [ 16 + "--with-layout=fhs-system" 17 + "--disable-install-p" 18 + ]; 19 + 20 + preConfigure = '' 21 + configureFlags="$configureFlags --with-config-file=$out/etc/GNUstep/GNUstep.conf" 22 + ''; 23 + 24 + makeFlags = [ 25 + "GNUSTEP_INSTALLATION_DOMAIN=SYSTEM" 26 + ]; 27 + 28 + buildInputs = [ clang which libobjc ]; 29 + patches = [ ./fixup-paths.patch ]; 30 + setupHook = ./setup-hook.sh; 31 + meta = { 32 + description = "A build manager for GNUstep"; 33 + homepage = http://gnustep.org/; 34 + license = stdenv.lib.licenses.lgpl2Plus; 35 + maintainers = with stdenv.lib.maintainers; [ ashalkhakov matthewbauer ]; 36 + platforms = stdenv.lib.platforms.unix; 37 + }; 38 + }

+197

pkgs/desktops/gnustep/make/fixup-paths.patch

··· 1 + diff -r -u gnustep-make-2.6.6/common.make gnustep-make-2.6.6.patched/common.make 2 + --- gnustep-make-2.6.6/common.make 2013-03-04 17:21:55.000000000 +0600 3 + +++ gnustep-make-2.6.6.patched/common.make 2015-01-18 14:36:25.000000000 +0600 4 + @@ -135,7 +135,9 @@ 5 + endif 6 + # Then include makefiles with flags/config options installed by the 7 + # libraries themselves 8 + --include $(GNUSTEP_MAKEFILES)/Additional/*.make 9 + +ifneq ($(NIX_GNUSTEP_MAKEFILES_ADDITIONAL),) 10 + +include $(NIX_GNUSTEP_MAKEFILES_ADDITIONAL) 11 + +endif 12 + 13 + # 14 + # Determine target specific settings 15 + diff -r -u gnustep-make-2.6.6/GNUmakefile.in gnustep-make-2.6.6.patched/GNUmakefile.in 16 + --- gnustep-make-2.6.6/GNUmakefile.in 2013-09-20 12:13:15.000000000 +0600 17 + +++ gnustep-make-2.6.6.patched/GNUmakefile.in 2014-12-07 20:35:27.000000000 +0600 18 + @@ -173,7 +173,6 @@ 19 + "$(makedir)/$(GNUSTEP_TARGET_CPU)" \ 20 + "$(makedir)/$(GNUSTEP_TARGET_DIR)" \ 21 + "$(makedir)/$(GNUSTEP_TARGET_LDIR)" \ 22 + - "$(makedir)/Additional" \ 23 + "$(makedir)/Auxiliary" \ 24 + "$(makedir)/Master" \ 25 + "$(makedir)/Instance" \ 26 + @@ -314,7 +313,6 @@ 27 + -rmdir "$(makedir)/Instance" 28 + -rmdir "$(makedir)/Master" 29 + -rmdir "$(makedir)/Auxiliary" 30 + - -rmdir "$(makedir)/Additional" 31 + -rmdir "$(makedir)/$(GNUSTEP_TARGET_LDIR)" 32 + -rmdir "$(makedir)/$(GNUSTEP_TARGET_DIR)" 33 + -rmdir "$(makedir)/$(GNUSTEP_TARGET_CPU)" 34 + diff -r -u gnustep-make-2.6.6/gnustep-config.in gnustep-make-2.6.6.patched/gnustep-config.in 35 + --- gnustep-make-2.6.6/gnustep-config.in 2013-07-02 16:06:24.000000000 +0600 36 + +++ gnustep-make-2.6.6.patched/gnustep-config.in 2014-12-09 21:29:49.000000000 +0600 37 + @@ -66,6 +66,7 @@ 38 + echo " --variable=OBJCXX" 39 + echo " --variable=GNUMAKE" 40 + echo " --variable=GNUSTEP_MAKEFILES" 41 + + echo " --variable=NIX_GNUSTEP_MAKEFILES_ADDITIONAL" 42 + echo " --variable=GNUSTEP_USER_DEFAULTS_DIR" 43 + echo " --variable=GNUSTEP_HOST" 44 + echo " --variable=GNUSTEP_HOST_CPU" 45 + @@ -153,6 +154,8 @@ 46 + 47 + export GNUSTEP_MAKEFILES 48 + 49 + +export NIX_GNUSTEP_MAKEFILES_ADDITIONAL 50 + + 51 + # 52 + # If all they want to know if GNUSTEP_MAKEFILES or anything that 53 + # we can compute only using GNUSTEP_MAKEFILES, we can print it out 54 + @@ -168,6 +171,8 @@ 55 + exit 0;; 56 + --variable=GNUSTEP_MAKEFILES) echo "$GNUSTEP_MAKEFILES" 57 + exit 0;; 58 + + --variable=NIX_GNUSTEP_MAKEFILES_ADDITIONAL) echo "$NIX_GNUSTEP_MAKEFILES_ADDITIONAL" 59 + + exit 0;; 60 + --variable=GNUMAKE) echo "@GNUMAKE@" 61 + exit 0;; 62 + --debug-flags) @GNUMAKE@ -s -f "$GNUSTEP_MAKEFILES/empty.make" print-gnustep-make-objc-flags quiet=yes debug=yes 2>/dev/null 63 + Only in gnustep-make-2.6.6.patched: gnustep-config.in~ 64 + diff -r -u gnustep-make-2.6.6/GNUstep.csh.in gnustep-make-2.6.6.patched/GNUstep.csh.in 65 + --- gnustep-make-2.6.6/GNUstep.csh.in 2011-05-03 13:40:10.000000000 +0600 66 + +++ gnustep-make-2.6.6.patched/GNUstep.csh.in 2014-12-09 20:14:05.000000000 +0600 67 + @@ -130,6 +130,10 @@ 68 + setenv GNUSTEP_MAKEFILES "@GNUSTEP_MAKEFILES@" 69 + endif 70 + 71 + +if ( ! ${?NIX_GNUSTEP_MAKEFILES_ADDITIONAL} ) then 72 + + setenv NIX_GNUSTEP_MAKEFILES_ADDITIONAL "@NIX_GNUSTEP_MAKEFILES_ADDITIONAL@" 73 + +endif 74 + + 75 + if ( "${GNUSTEP_MAKE_STRICT_V2_MODE}" == "yes" ) then 76 + unsetenv GNUSTEP_USER_DIR 77 + unsetenv GNUSTEP_USER_ROOT 78 + Only in gnustep-make-2.6.6.patched: GNUstep.csh.in~ 79 + diff -r -u gnustep-make-2.6.6/GNUstep.sh.in gnustep-make-2.6.6.patched/GNUstep.sh.in 80 + --- gnustep-make-2.6.6/GNUstep.sh.in 2012-02-21 20:21:38.000000000 +0600 81 + +++ gnustep-make-2.6.6.patched/GNUstep.sh.in 2015-01-18 14:48:09.000000000 +0600 82 + @@ -173,7 +173,6 @@ 83 + fi 84 + export GNUSTEP_MAKEFILES 85 + 86 + - 87 + if [ "$GNUSTEP_MAKE_STRICT_V2_MODE" = "yes" ]; then 88 + # Make sure this is never set in gnustep-make v2 strict mode; it 89 + # might have been set in the config file. 90 + @@ -300,7 +299,7 @@ 91 + # for each duplicate. When there are many duplicates it's faster to 92 + # use print_unique_pathlist.sh first to remove them and skip the 93 + # echos+greps later. 94 + -GNUSTEP_TOOLS_PATHLIST=`$GNUSTEP_MAKEFILES/print_unique_pathlist.sh "$GNUSTEP_USER_TOOLS" "$GNUSTEP_LOCAL_TOOLS" "$GNUSTEP_NETWORK_TOOLS" "$GNUSTEP_SYSTEM_TOOLS" $fixup_paths` 95 + +GNUSTEP_TOOLS_PATHLIST=$NIX_GNUSTEP_SYSTEM_TOOLS 96 + 97 + # Now, we check the paths in GNUSTEP_*_ADMIN_TOOLS. These paths 98 + # should only be used by Administrators -- normal users don't have 99 + @@ -313,7 +312,7 @@ 100 + 101 + # So we examine GNUSTEP_*_ADMIN_TOOLS; if we find any path in that 102 + # list that exists and that we can write to, we add it to our PATH. 103 + -for dir in "$GNUSTEP_SYSTEM_ADMIN_TOOLS" "$GNUSTEP_NETWORK_ADMIN_TOOLS" "$GNUSTEP_LOCAL_ADMIN_TOOLS" "$GNUSTEP_USER_ADMIN_TOOLS"; do 104 + +for dir in $(echo "$NIX_GNUSTEP_SYSTEM_ADMIN_TOOLS" | tr ":" "\n"); do 105 + if [ -d "$dir" -a -w "$dir" ]; then 106 + # Only add the new dir if it's not already in GNUSTEP_TOOLS_PATHLIST 107 + if (echo ":${GNUSTEP_TOOLS_PATHLIST}:" \ 108 + @@ -356,7 +355,7 @@ 109 + export PATH 110 + 111 + # Determine the library paths 112 + -GNUSTEP_LIBRARIES_PATHLIST=`$GNUSTEP_MAKEFILES/print_unique_pathlist.sh "$GNUSTEP_USER_LIBRARIES" "$GNUSTEP_LOCAL_LIBRARIES" "$GNUSTEP_NETWORK_LIBRARIES" "$GNUSTEP_SYSTEM_LIBRARIES" $fixup_paths` 113 + +GNUSTEP_LIBRARIES_PATHLIST=$NIX_GNUSTEP_SYSTEM_LIBRARIES 114 + 115 + old_IFS="$IFS" 116 + IFS=: 117 + @@ -486,7 +485,7 @@ 118 + # 119 + # Setup Java CLASSPATH and Guile GUILE_LOAD_PATH 120 + # 121 + -GNUSTEP_LIBRARY_PATHLIST=`$GNUSTEP_MAKEFILES/print_unique_pathlist.sh "$GNUSTEP_USER_LIBRARY" "$GNUSTEP_LOCAL_LIBRARY" "$GNUSTEP_NETWORK_LIBRARY" "$GNUSTEP_SYSTEM_LIBRARY" $fixup_paths` 122 + +GNUSTEP_LIBRARY_PATHLIST=$NIX_GNUSTEP_SYSTEM_LIBRARY 123 + 124 + old_IFS="$IFS" 125 + IFS=: 126 + @@ -526,7 +525,7 @@ 127 + # xxx/Library/Documentation/info, are found by the info browsing 128 + # programs. To get this effect, we add those paths to INFOPATH. 129 + # 130 + -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` 131 + +GNUSTEP_INFO_PATHLIST=$NIX_GNUSTEP_SYSTEM_DOC_INFO 132 + old_IFS="$IFS" 133 + IFS=: 134 + for dir in $GNUSTEP_INFO_PATHLIST; do 135 + @@ -559,6 +558,7 @@ 136 + 137 + unset GNUSTEP_KEEP_CONFIG_FILE GNUSTEP_KEEP_USER_CONFIG_FILE 138 + 139 + + 140 + export GNUSTEP_CONFIG_FILE GNUSTEP_USER_CONFIG_FILE 141 + 142 + export GNUSTEP_USER_DEFAULTS_DIR 143 + diff -r -u gnustep-make-2.6.6/GNUstep-strict-v2.conf.in gnustep-make-2.6.6.patched/GNUstep-strict-v2.conf.in 144 + --- gnustep-make-2.6.6/GNUstep-strict-v2.conf.in 2008-01-15 20:35:36.000000000 +0600 145 + +++ gnustep-make-2.6.6.patched/GNUstep-strict-v2.conf.in 2014-12-07 22:04:56.000000000 +0600 146 + @@ -47,7 +47,6 @@ 147 + # Traditionally, this is /usr/GNUstep/System/Library/Makefiles 148 + GNUSTEP_MAKEFILES=@GNUSTEP_MAKEFILES@ 149 + 150 + - 151 + # This is where the user home directories are. Only used to provide 152 + # NSUserDirectory in gnustep-base. Never used anywhere else. 153 + GNUSTEP_SYSTEM_USERS_DIR=@GNUSTEP_SYSTEM_USERS_DIR@ 154 + diff -r -u gnustep-make-2.6.6/library-combo.make gnustep-make-2.6.6.patched/library-combo.make 155 + --- gnustep-make-2.6.6/library-combo.make 2012-02-21 19:53:02.000000000 +0600 156 + +++ gnustep-make-2.6.6.patched/library-combo.make 2014-12-09 20:15:05.000000000 +0600 157 + @@ -142,7 +142,7 @@ 158 + # 159 + # Third-party foundations not using make package 160 + # Our own foundation will install a base.make file into 161 + -# $GNUSTEP_MAKEFILES/Additional/ to set the needed flags 162 + +# $NIX_GNUSTEP_MAKEFILES_ADDITIONAL to set the needed flags 163 + # 164 + ifeq ($(FOUNDATION_LIB), nx) 165 + # -framework Foundation is used both to find headers, and to link 166 + @@ -166,7 +166,7 @@ 167 + 168 + # 169 + # FIXME - Ask Helge to move this inside his libFoundation, and have 170 + -# it installed as a $(GNUSTEP_MAKEFILES)/Additional/libFoundation.make 171 + +# it installed as a $(NIX_GNUSTEP_MAKEFILES_ADDITIONAL)/libFoundation.make 172 + # 173 + ifeq ($(FOUNDATION_LIB),fd) 174 + -include $(GNUSTEP_MAKEFILES)/libFoundation.make 175 + @@ -193,7 +193,7 @@ 176 + GUI_LIBS = 177 + # 178 + # Third-party GUI libraries - our own sets its flags into 179 + -# $(GNUSTEP_MAKEFILES)/Additional/gui.make 180 + +# $(NIX_GNUSTEP_MAKEFILES_ADDITIONAL)/gui.make 181 + # 182 + ifeq ($(GUI_LIB), nx) 183 + GUI_DEFINE = -DNeXT_GUI_LIBRARY=1 184 + diff -r -u gnustep-make-2.6.6/rules.make gnustep-make-2.6.6.patched/rules.make 185 + --- gnustep-make-2.6.6/rules.make 2013-07-04 16:05:44.000000000 +0600 186 + +++ gnustep-make-2.6.6.patched/rules.make 2014-12-09 21:31:04.000000000 +0600 187 + @@ -667,7 +667,9 @@ 188 + exit 1$(END_ECHO) 189 + endif 190 + 191 + -$(GNUSTEP_MAKEFILES)/Additional/*.make: ; 192 + +ifneq ($(NIX_GNUSTEP_MAKEFILES_ADDITIONAL),) 193 + +$(NIX_GNUSTEP_MAKEFILES_ADDITIONAL): ; 194 + +endif 195 + 196 + $(GNUSTEP_MAKEFILES)/Master/*.make: ; 197 +

+145

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

··· 1 + diff -ru gnustep-make-2.6.6/common.make gnustep-make-2.6.6.patched/common.make 2 + --- gnustep-make-2.6.6/common.make 2013-03-04 17:21:55.000000000 +0600 3 + +++ gnustep-make-2.6.6.patched/common.make 2014-12-09 21:29:10.000000000 +0600 4 + @@ -135,7 +135,9 @@ 5 + endif 6 + # Then include makefiles with flags/config options installed by the 7 + # libraries themselves 8 + --include $(GNUSTEP_MAKEFILES)/Additional/*.make 9 + +ifneq ($(NIX_GNUSTEP_MAKEFILES_ADDITIONAL),) 10 + +-include $(NIX_GNUSTEP_MAKEFILES_ADDITIONAL) 11 + +endif 12 + 13 + # 14 + # Determine target specific settings 15 + diff -ru gnustep-make-2.6.6/GNUmakefile.in gnustep-make-2.6.6.patched/GNUmakefile.in 16 + --- gnustep-make-2.6.6/GNUmakefile.in 2013-09-20 12:13:15.000000000 +0600 17 + +++ gnustep-make-2.6.6.patched/GNUmakefile.in 2014-12-07 20:35:27.000000000 +0600 18 + @@ -173,7 +173,6 @@ 19 + "$(makedir)/$(GNUSTEP_TARGET_CPU)" \ 20 + "$(makedir)/$(GNUSTEP_TARGET_DIR)" \ 21 + "$(makedir)/$(GNUSTEP_TARGET_LDIR)" \ 22 + - "$(makedir)/Additional" \ 23 + "$(makedir)/Auxiliary" \ 24 + "$(makedir)/Master" \ 25 + "$(makedir)/Instance" \ 26 + @@ -314,7 +313,6 @@ 27 + -rmdir "$(makedir)/Instance" 28 + -rmdir "$(makedir)/Master" 29 + -rmdir "$(makedir)/Auxiliary" 30 + - -rmdir "$(makedir)/Additional" 31 + -rmdir "$(makedir)/$(GNUSTEP_TARGET_LDIR)" 32 + -rmdir "$(makedir)/$(GNUSTEP_TARGET_DIR)" 33 + -rmdir "$(makedir)/$(GNUSTEP_TARGET_CPU)" 34 + diff -ru gnustep-make-2.6.6/gnustep-config.in gnustep-make-2.6.6.patched/gnustep-config.in 35 + --- gnustep-make-2.6.6/gnustep-config.in 2013-07-02 16:06:24.000000000 +0600 36 + +++ gnustep-make-2.6.6.patched/gnustep-config.in 2014-12-09 21:29:49.000000000 +0600 37 + @@ -66,6 +66,7 @@ 38 + echo " --variable=OBJCXX" 39 + echo " --variable=GNUMAKE" 40 + echo " --variable=GNUSTEP_MAKEFILES" 41 + + echo " --variable=NIX_GNUSTEP_MAKEFILES_ADDITIONAL" 42 + echo " --variable=GNUSTEP_USER_DEFAULTS_DIR" 43 + echo " --variable=GNUSTEP_HOST" 44 + echo " --variable=GNUSTEP_HOST_CPU" 45 + @@ -153,6 +154,8 @@ 46 + 47 + export GNUSTEP_MAKEFILES 48 + 49 + +export NIX_GNUSTEP_MAKEFILES_ADDITIONAL 50 + + 51 + # 52 + # If all they want to know if GNUSTEP_MAKEFILES or anything that 53 + # we can compute only using GNUSTEP_MAKEFILES, we can print it out 54 + @@ -168,6 +171,8 @@ 55 + exit 0;; 56 + --variable=GNUSTEP_MAKEFILES) echo "$GNUSTEP_MAKEFILES" 57 + exit 0;; 58 + + --variable=NIX_GNUSTEP_MAKEFILES_ADDITIONAL) echo "$NIX_GNUSTEP_MAKEFILES_ADDITIONAL" 59 + + exit 0;; 60 + --variable=GNUMAKE) echo "@GNUMAKE@" 61 + exit 0;; 62 + --debug-flags) @GNUMAKE@ -s -f "$GNUSTEP_MAKEFILES/empty.make" print-gnustep-make-objc-flags quiet=yes debug=yes 2>/dev/null 63 + diff -ru gnustep-make-2.6.6/GNUstep.csh.in gnustep-make-2.6.6.patched/GNUstep.csh.in 64 + --- gnustep-make-2.6.6/GNUstep.csh.in 2011-05-03 13:40:10.000000000 +0600 65 + +++ gnustep-make-2.6.6.patched/GNUstep.csh.in 2014-12-09 20:14:05.000000000 +0600 66 + @@ -130,6 +130,10 @@ 67 + setenv GNUSTEP_MAKEFILES "@GNUSTEP_MAKEFILES@" 68 + endif 69 + 70 + +if ( ! ${?NIX_GNUSTEP_MAKEFILES_ADDITIONAL} ) then 71 + + setenv NIX_GNUSTEP_MAKEFILES_ADDITIONAL "@NIX_GNUSTEP_MAKEFILES_ADDITIONAL@" 72 + +endif 73 + + 74 + if ( "${GNUSTEP_MAKE_STRICT_V2_MODE}" == "yes" ) then 75 + unsetenv GNUSTEP_USER_DIR 76 + unsetenv GNUSTEP_USER_ROOT 77 + diff -ru gnustep-make-2.6.6/GNUstep.sh.in gnustep-make-2.6.6.patched/GNUstep.sh.in 78 + --- gnustep-make-2.6.6/GNUstep.sh.in 2012-02-21 20:21:38.000000000 +0600 79 + +++ gnustep-make-2.6.6.patched/GNUstep.sh.in 2014-12-09 20:14:19.000000000 +0600 80 + @@ -173,6 +173,10 @@ 81 + fi 82 + export GNUSTEP_MAKEFILES 83 + 84 + +if [ -z "$NIX_GNUSTEP_MAKEFILES_ADDITIONAL" ]; then 85 + + NIX_GNUSTEP_MAKEFILES_ADDITIONAL=@NIX_GNUSTEP_MAKEFILES_ADDITIONAL@ 86 + +fi 87 + +export NIX_GNUSTEP_MAKEFILES_ADDITIONAL 88 + 89 + if [ "$GNUSTEP_MAKE_STRICT_V2_MODE" = "yes" ]; then 90 + # Make sure this is never set in gnustep-make v2 strict mode; it 91 + diff -ru gnustep-make-2.6.6/GNUstep-strict-v2.conf.in gnustep-make-2.6.6.patched/GNUstep-strict-v2.conf.in 92 + --- gnustep-make-2.6.6/GNUstep-strict-v2.conf.in 2008-01-15 20:35:36.000000000 +0600 93 + +++ gnustep-make-2.6.6.patched/GNUstep-strict-v2.conf.in 2014-12-07 22:04:56.000000000 +0600 94 + @@ -47,7 +47,6 @@ 95 + # Traditionally, this is /usr/GNUstep/System/Library/Makefiles 96 + GNUSTEP_MAKEFILES=@GNUSTEP_MAKEFILES@ 97 + 98 + - 99 + # This is where the user home directories are. Only used to provide 100 + # NSUserDirectory in gnustep-base. Never used anywhere else. 101 + GNUSTEP_SYSTEM_USERS_DIR=@GNUSTEP_SYSTEM_USERS_DIR@ 102 + diff -ru gnustep-make-2.6.6/library-combo.make gnustep-make-2.6.6.patched/library-combo.make 103 + --- gnustep-make-2.6.6/library-combo.make 2012-02-21 19:53:02.000000000 +0600 104 + +++ gnustep-make-2.6.6.patched/library-combo.make 2014-12-09 20:15:05.000000000 +0600 105 + @@ -142,7 +142,7 @@ 106 + # 107 + # Third-party foundations not using make package 108 + # Our own foundation will install a base.make file into 109 + -# $GNUSTEP_MAKEFILES/Additional/ to set the needed flags 110 + +# $NIX_GNUSTEP_MAKEFILES_ADDITIONAL to set the needed flags 111 + # 112 + ifeq ($(FOUNDATION_LIB), nx) 113 + # -framework Foundation is used both to find headers, and to link 114 + @@ -166,7 +166,7 @@ 115 + 116 + # 117 + # FIXME - Ask Helge to move this inside his libFoundation, and have 118 + -# it installed as a $(GNUSTEP_MAKEFILES)/Additional/libFoundation.make 119 + +# it installed as a $(NIX_GNUSTEP_MAKEFILES_ADDITIONAL)/libFoundation.make 120 + # 121 + ifeq ($(FOUNDATION_LIB),fd) 122 + -include $(GNUSTEP_MAKEFILES)/libFoundation.make 123 + @@ -193,7 +193,7 @@ 124 + GUI_LIBS = 125 + # 126 + # Third-party GUI libraries - our own sets its flags into 127 + -# $(GNUSTEP_MAKEFILES)/Additional/gui.make 128 + +# $(NIX_GNUSTEP_MAKEFILES_ADDITIONAL)/gui.make 129 + # 130 + ifeq ($(GUI_LIB), nx) 131 + GUI_DEFINE = -DNeXT_GUI_LIBRARY=1 132 + diff -ru gnustep-make-2.6.6/rules.make gnustep-make-2.6.6.patched/rules.make 133 + --- gnustep-make-2.6.6/rules.make 2013-07-04 16:05:44.000000000 +0600 134 + +++ gnustep-make-2.6.6.patched/rules.make 2014-12-09 21:31:04.000000000 +0600 135 + @@ -667,7 +667,9 @@ 136 + exit 1$(END_ECHO) 137 + endif 138 + 139 + -$(GNUSTEP_MAKEFILES)/Additional/*.make: ; 140 + +ifneq ($(NIX_GNUSTEP_MAKEFILES_ADDITIONAL),) 141 + +$(NIX_GNUSTEP_MAKEFILES_ADDITIONAL): ; 142 + +endif 143 + 144 + $(GNUSTEP_MAKEFILES)/Master/*.make: ; 145 +

+19

pkgs/desktops/gnustep/make/gsmakeDerivation.nix

··· 1 + { stdenv, lib, make, makeWrapper, which }: 2 + { buildInputs ? [], ...} @ args: 3 + stdenv.mkDerivation (args // { 4 + buildInputs = [ makeWrapper make which ] ++ buildInputs; 5 + 6 + builder = ./builder.sh; 7 + setupHook = ./setup-hook.sh; 8 + 9 + GNUSTEP_MAKEFILES = "${make}/share/GNUstep/Makefiles"; 10 + 11 + meta = { 12 + homepage = http://gnustep.org/; 13 + 14 + license = stdenv.lib.licenses.lgpl2Plus; 15 + 16 + maintainers = with stdenv.lib.maintainers; [ ashalkhakov matthewbauer ]; 17 + platforms = stdenv.lib.platforms.linux; 18 + } // (if builtins.hasAttr "meta" args then args.meta else {}); 19 + })

+77

pkgs/desktops/gnustep/make/setup-hook.sh

··· 1 + # this path is used by some packages to install additional makefiles 2 + export DESTDIR_GNUSTEP_MAKEFILES=$out/share/GNUstep/Makefiles 3 + 4 + installFlagsArray=( \ 5 + "GNUSTEP_INSTALLATION_DOMAIN=SYSTEM" \ 6 + "GNUSTEP_SYSTEM_APPS=$out/lib/GNUstep/Applications" \ 7 + "GNUSTEP_SYSTEM_ADMIN_APPS=$out/lib/GNUstep/Applications" \ 8 + "GNUSTEP_SYSTEM_WEB_APPS=$out/lib/GNUstep/WebApplications" \ 9 + "GNUSTEP_SYSTEM_TOOLS=$out/bin" \ 10 + "GNUSTEP_SYSTEM_ADMIN_TOOLS=$out/sbin" \ 11 + "GNUSTEP_SYSTEM_LIBRARY=$out/lib/GNUstep" \ 12 + "GNUSTEP_SYSTEM_HEADERS=$out/include" \ 13 + "GNUSTEP_SYSTEM_LIBRARIES=$out/lib" \ 14 + "GNUSTEP_SYSTEM_DOC=$out/share/GNUstep/Documentation" \ 15 + "GNUSTEP_SYSTEM_DOC_MAN=$out/share/man" \ 16 + "GNUSTEP_SYSTEM_DOC_INFO=$out/share/info" \ 17 + ) 18 + 19 + addEnvVars() { 20 + local filename 21 + 22 + for filename in $1/share/GNUstep/Makefiles/Additional/*.make ; do 23 + if case "$NIX_GNUSTEP_MAKEFILES_ADDITIONAL" in *"{$filename}"*) false;; *) true;; esac; then 24 + export NIX_GNUSTEP_MAKEFILES_ADDITIONAL+=" $filename" 25 + fi 26 + done 27 + 28 + local tmp="$1/lib/GNUstep/Applications" 29 + if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_APPS" in *"${tmp}"*) false;; *) true;; esac; then 30 + addToSearchPath NIX_GNUSTEP_SYSTEM_APPS "$tmp" 31 + fi 32 + tmp="$1/lib/GNUstep/Applications" 33 + if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_ADMIN_APPS" in *"${tmp}"*) false;; *) true;; esac; then 34 + addToSearchPath NIX_GNUSTEP_SYSTEM_ADMIN_APPS "$tmp" 35 + fi 36 + tmp="$1/lib/GNUstep/WebApplications" 37 + if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_WEB_APPS" in *"${tmp}"*) false;; *) true;; esac; then 38 + addToSearchPath NIX_GNUSTEP_SYSTEM_WEB_APPS "$tmp" 39 + fi 40 + tmp="$1/bin" 41 + if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_TOOLS" in *"${tmp}"*) false;; *) true;; esac; then 42 + addToSearchPath NIX_GNUSTEP_SYSTEM_TOOLS "$tmp" 43 + fi 44 + tmp="$1/sbin" 45 + if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_ADMIN_TOOLS" in *"${tmp}"*) false;; *) true;; esac; then 46 + addToSearchPath NIX_GNUSTEP_SYSTEM_ADMIN_TOOLS "$tmp" 47 + fi 48 + tmp="$1/lib/GNUstep" 49 + if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_LIBRARY" in *"${tmp}"*) false;; *) true;; esac; then 50 + addToSearchPath NIX_GNUSTEP_SYSTEM_LIBRARY "$tmp" 51 + fi 52 + tmp="$1/include" 53 + if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_HEADERS" in *"${tmp}"*) false;; *) true;; esac; then 54 + if [ -z "$NIX_GNUSTEP_SYSTEM_HEADERS" ]; then 55 + export NIX_GNUSTEP_SYSTEM_HEADERS="$tmp" 56 + else 57 + export NIX_GNUSTEP_SYSTEM_HEADERS+=" $tmp" 58 + fi 59 + fi 60 + tmp="$1/lib" 61 + if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_LIBRARIES" in *"${tmp}"*) false;; *) true;; esac; then 62 + addToSearchPath NIX_GNUSTEP_SYSTEM_LIBRARIES "$tmp" 63 + fi 64 + tmp="$1/share/GNUstep/Documentation" 65 + if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_DOC" in *"${tmp}"*) false;; *) true;; esac; then 66 + addToSearchPath NIX_GNUSTEP_SYSTEM_DOC "$tmp" 67 + fi 68 + tmp="$1/share/man" 69 + if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_DOC_MAN" in *"${tmp}"*) false;; *) true;; esac; then 70 + addToSearchPath NIX_GNUSTEP_SYSTEM_DOC_MAN "$tmp" 71 + fi 72 + tmp="$1/share/info" 73 + if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_DOC_INFO" in *"${tmp}"*) false;; *) true;; esac; then 74 + addToSearchPath NIX_GNUSTEP_SYSTEM_DOC_INFO "$tmp" 75 + fi 76 + } 77 + envHooks=(${envHooks[@]} addEnvVars)

+4

pkgs/desktops/gnustep/make/wrapper.sh

··· 1 + #!/bin/sh 2 + 3 + . $GNUSTEP_MAKEFILES/GNUstep.sh 4 + $1

+23

pkgs/desktops/gnustep/projectcenter/default.nix

··· 1 + { fetchurl 2 + , base, back, gsmakeDerivation, gui, gorm 3 + , gnumake, gdb 4 + }: 5 + let 6 + version = "0.6.2"; 7 + in 8 + gsmakeDerivation { 9 + name = "projectcenter-${version}"; 10 + src = fetchurl { 11 + url = "ftp://ftp.gnustep.org/pub/gnustep/dev-apps/ProjectCenter-${version}.tar.gz"; 12 + sha256 = "0wwlbpqf541apw192jb633d634zkpjhcrrkd1j80y9hihphll465"; 13 + }; 14 + 15 + # NOTE: need a patch for ProjectCenter to help it locate some necessary tools: 16 + # 1. Framework/PCProjectLauncher.m, locate gdb (say among NIX_GNUSTEP_SYSTEM_TOOLS) 17 + # 2. Framework/PCProjectBuilder.m, locate gmake (similar) 18 + propagatedBuildInputs = [ base back gui gnumake gdb gorm ]; 19 + 20 + meta = { 21 + description = "GNUstep's integrated development environment"; 22 + }; 23 + }

+14

pkgs/desktops/gnustep/projectcenter/fixup-preamble.patch

··· 1 + diff -c ProjectCenter-0.6.2/GNUmakefile.preamble ProjectCenter-0.6.2.patched/GNUmakefile.preamble 2 + --- ProjectCenter-0.6.2/GNUmakefile.preamble 2010-08-08 03:56:04.000000000 +0600 3 + +++ artyom/ProjectCenter-0.6.2.patched/GNUmakefile.preamble 2014-12-01 20:08:31.000000000 +0600 4 + @@ -39,7 +39,7 @@ 5 + ADDITIONAL_INCLUDE_DIRS += -I./ -I./Headers 6 + 7 + # Additional LDFLAGS to pass to the linker 8 + -ADDITIONAL_LDFLAGS += 9 + +ADDITIONAL_LDFLAGS += -lgnustep-base -lgnustep-gui 10 + 11 + # Additional library directories the linker should search 12 + ADDITIONAL_LIB_DIRS += -L./Framework/ProjectCenter.framework/$(GNUSTEP_TARGET_LDIR) 13 + 14 + Diff finished. Mon Dec 1 20:08:50 2014

+17

pkgs/desktops/gnustep/systempreferences/default.nix

··· 1 + { back, base, gui, gsmakeDerivation, fetchurl }: 2 + let 3 + version = "1.1.0"; 4 + in 5 + gsmakeDerivation { 6 + name = "system_preferences-${version}"; 7 + src = fetchurl { 8 + url = "ftp://ftp.gnustep.org/pub/gnustep/usr-apps/SystemPreferences-${version}.tar.gz"; 9 + sha256 = "1q68bs8rlq0dxkar01qs5wfyas4iivddnama371jd7ll6cxzmpy7"; 10 + }; 11 + # GNUSTEP_MAKEFILES = "${gnustep_make}/share/GNUstep/Makefiles"; 12 + buildInputs = [ back base gui ]; 13 + # propagatedBuildInputs = [ gnustep_back gnustep_base gnustep_gui ]; 14 + meta = { 15 + description = "The settings manager for the GNUstep environment and its applications"; 16 + }; 17 + }

-38

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

··· 1 - { stdenv, fetchurl }: 2 - 3 - let version = "2.6.7"; in 4 - stdenv.mkDerivation rec { 5 - name = "gnustep-make-${version}"; 6 - 7 - src = fetchurl { 8 - url = "http://ftpmain.gnustep.org/pub/gnustep/core/${name}.tar.gz"; 9 - sha256 = "1r2is23xdg4qirckb6bd4lynfwnnw5d9522wib3ndk1xgirmfaqi"; 10 - }; 11 - 12 - patchPhase = '' 13 - substituteInPlace GNUmakefile.in \ 14 - --replace which type \ 15 - --replace 'tooldir = $(DESTDIR)' 'tooldir = ' \ 16 - --replace 'makedir = $(DESTDIR)' 'makedir = ' \ 17 - --replace 'mandir = $(DESTDIR)' 'mandir = ' 18 - 19 - substituteInPlace FilesystemLayouts/apple \ 20 - --replace /usr/local "" 21 - 22 - substituteInPlace configure \ 23 - --replace /Library/GNUstep "$out" 24 - ''; 25 - 26 - installFlags = "DESTDIR=$(out)"; 27 - 28 - postInstall = '' 29 - mkdir -p $out/nix-support 30 - cat >$out/nix-support/setup-hook <<EOF 31 - . $out/Library/GNUstep/Makefiles/GNUstep.sh 32 - EOF 33 - ''; 34 - 35 - meta = { 36 - platforms = stdenv.lib.platforms.unix; 37 - }; 38 - }

-23

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

··· 1 - { stdenv, fetchgit, gnustep-make, Foundation, libobjc }: 2 - 3 - stdenv.mkDerivation rec { 4 - name = "xcode-${version}"; 5 - version = "1.0"; 6 - 7 - makeFlags = "messages=yes"; 8 - 9 - installFlags = "DESTDIR=$(out)"; 10 - 11 - __impureHostDeps = [ 12 - "/System/Library/PrivateFrameworks/UIFoundation.framework/Versions/A/UIFoundation" 13 - "/usr/lib/libextension.dylib" 14 - ]; 15 - 16 - buildInputs = [ gnustep-make Foundation libobjc ]; 17 - 18 - src = fetchgit { 19 - url = "https://github.com/gnustep/xcode"; 20 - rev = "cc5016794e44f9998674120a5e4625aa09ca455a"; 21 - sha256 = "85420f3f61091b2e4548cf5e99d886cb9c72cf07b8b9fae3eebc87e7b6b7e54a"; 22 - }; 23 - }

+1

pkgs/top-level/aliases.nix

··· 49 49 git-hub = gitAndTools.git-hub; # added 2016-04-29 50 50 grantlee5 = qt5.grantlee; # added 2015-12-19 51 51 gupnptools = gupnp-tools; # added 2015-12-19 52 + gnustep-make = gnustep.make; # added 2016-7-6 52 53 htmlTidy = html-tidy; # added 2014-12-06 53 54 inherit (haskell.compiler) jhc uhc; # 2015-05-15 54 55 inotifyTools = inotify-tools;

+2 -6

pkgs/top-level/all-packages.nix

··· 6433 6433 gnumake42 = callPackage ../development/tools/build-managers/gnumake/4.2 { }; 6434 6434 gnumake = self.gnumake42; 6435 6435 6436 + gnustep = recurseIntoAttrs (callPackage ../desktops/gnustep {}); 6437 + 6436 6438 gob2 = callPackage ../development/tools/misc/gob2 { }; 6437 6439 6438 6440 gocd-agent = callPackage ../development/tools/continuous-integration/gocd-agent { }; ··· 10846 10848 libobjc = apple-source-releases.objc4; 10847 10849 10848 10850 stubs = callPackages ../os-specific/darwin/stubs {}; 10849 - }; 10850 - 10851 - gnustep-make = callPackage ../development/tools/build-managers/gnustep/make {}; 10852 - gnustep-xcode = callPackage ../development/tools/build-managers/gnustep/xcode { 10853 - inherit (darwin.apple_sdk.frameworks) Foundation; 10854 - inherit (darwin) libobjc; 10855 10851 }; 10856 10852 10857 10853 devicemapper = self.lvm2;