gnustep: use gnustep_builder

Built ProjectCenter and Gorm with the new gnustep_builder. Had to go
back and fix a few things.

2 files changed, 8 insertions, 93 deletions

diff --git a/pkgs/applications/editors/gorm/default.nix b/pkgs/applications/editors/gorm/default.nix
index fd0b88322cdb9..571c4f1b55e0a 100644
--- a/pkgs/applications/editors/gorm/default.nix
+++ b/pkgs/applications/editors/gorm/default.nix
@@ -1,60 +1,17 @@
 { buildEnv
-, stdenv, fetchurl, gnustep_base, gnustep_make, gnustep_back, gnustep_gui
+, stdenv, fetchurl, gnustep_builder, gnustep_base, gnustep_back, gnustep_gui
 }:
 let
   version = "1.2.18";
 in
-stdenv.mkDerivation rec {
+gnustep_builder.mkDerivation rec {
   name = "gorm-${version}";
   
   src = fetchurl {
     url = "ftp://ftp.gnustep.org/pub/gnustep/dev-apps/gorm-${version}.tar.gz";
     sha256 = "1vpzvmsnynlq5dv6rw9vbk1zzsim6z7b2kprrlm8dknyq0r1sdrq";
   };
-  GNUSTEP_env = buildEnv {
-    name = "gnustep-gorm-env";
-    paths = [ gnustep_make gnustep_back gnustep_base gnustep_gui ];
-    pathsToLink = [ "/bin" "/sbin" "/include" "/lib" "/share" ];
-  };
-  GNUSTEP_MAKEFILES = "${GNUSTEP_env}/share/GNUstep/Makefiles";
-  GNUSTEP_INSTALLATION_DOMAIN = "SYSTEM";
-  ADDITIONAL_CPPFLAGS = "-DGNUSTEP";
-  
-  buildInputs = [ gnustep_base gnustep_back gnustep_make gnustep_gui ];
-  dontBuild = true;
-  installPhase = ''
-    export ADDITIONAL_INCLUDE_DIRS=${GNUSTEP_env}/include
-    make \
-      GNUSTEP_SYSTEM_APPS=$GNUSTEP_env/lib/GNUstep/Applications \
-      GNUSTEP_SYSTEM_ADMIN_APPS=$GNUSTEP_env/lib/GNUstep/Applications \
-      GNUSTEP_SYSTEM_WEB_APPS=$GNUSTEP_env/lib/GNUstep/WebApplications \
-      GNUSTEP_SYSTEM_TOOLS=$GNUSTEP_env/bin \
-      GNUSTEP_SYSTEM_ADMIN_TOOLS=$GNUSTEP_env/sbin \
-      GNUSTEP_SYSTEM_LIBRARY=$GNUSTEP_env/lib/GNUstep \
-      GNUSTEP_SYSTEM_HEADERS=$GNUSTEP_env/include \
-      GNUSTEP_SYSTEM_LIBRARIES=$GNUSTEP_env/lib \
-      GNUSTEP_SYSTEM_DOC=$GNUSTEP_env/share/GNUstep/Documentation \
-      GNUSTEP_SYSTEM_DOC_MAN=$GNUSTEP_env/share/man \
-      GNUSTEP_SYSTEM_DOC_INFO=$GNUSTEP_env/share/info \
-      GNUSTEP_SYSTEM_LIBRARIES=$GNUSTEP_env/lib \
-      messages=yes
-    make install \
-      GNUSTEP_INSTALLATION_DOMAIN=SYSTEM \
-      GNUSTEP_SYSTEM_APPS=$out/lib/GNUstep/Applications \
-      GNUSTEP_SYSTEM_ADMIN_APPS=$out/lib/GNUstep/Applications \
-      GNUSTEP_SYSTEM_WEB_APPS=$out/lib/GNUstep/WebApplications \
-      GNUSTEP_SYSTEM_TOOLS=$out/bin \
-      GNUSTEP_SYSTEM_ADMIN_TOOLS=$out/sbin \
-      GNUSTEP_SYSTEM_LIBRARY=$out/lib/GNUstep \
-      GNUSTEP_SYSTEM_HEADERS=$out/include \
-      GNUSTEP_SYSTEM_LIBRARIES=$out/lib \
-      GNUSTEP_SYSTEM_DOC=$out/share/GNUstep/Documentation \
-      GNUSTEP_SYSTEM_DOC_MAN=$out/share/man \
-      GNUSTEP_SYSTEM_DOC_INFO=$out/share/info \
-      GNUSTEP_SYSTEM_LIBRARIES=$out/lib \
-      GNUSTEP_HEADERS=$out/include \
-      DESTDIR_GNUSTEP_MAKEFILES=$out/share/GNUstep/Makefiles
-  '';
+  deps = [ 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";
diff --git a/pkgs/applications/editors/projectcenter/default.nix b/pkgs/applications/editors/projectcenter/default.nix
index 56c4a0535c2b8..a52a2cf70e3e4 100644
--- a/pkgs/applications/editors/projectcenter/default.nix
+++ b/pkgs/applications/editors/projectcenter/default.nix
@@ -1,62 +1,20 @@
 { buildEnv
 , stdenv, fetchurl
-, gnustep_base, gnustep_make, gnustep_back, gnustep_gui
+, gnustep_builder
+, gnustep_base, gnustep_back, gnustep_gui
 }:
 let
   version = "0.6.2";
 in
-stdenv.mkDerivation rec {
+gnustep_builder.mkDerivation rec {
   name = "projectcenter-${version}";
   src = fetchurl {
     url = "ftp://ftp.gnustep.org/pub/gnustep/dev-apps/ProjectCenter-${version}.tar.gz";
     sha256 = "0wwlbpqf541apw192jb633d634zkpjhcrrkd1j80y9hihphll465";
   };
 
-  GNUSTEP_env = buildEnv {
-    name = "gnustep-projectcenter-env";
-    paths = [ gnustep_make gnustep_back gnustep_base gnustep_gui ];
-    pathsToLink = [ "/bin" "/sbin" "/include" "/lib" "/share" ];
-  };
-  GNUSTEP_MAKEFILES = "${GNUSTEP_env}/share/GNUstep/Makefiles";
-  GNUSTEP_INSTALLATION_DOMAIN = "SYSTEM";
-  ADDITIONAL_CPPFLAGS = "-DGNUSTEP";
-
-  patches = [ ./fixup-preamble.patch ];
-  buildInputs = [ gnustep_base gnustep_back gnustep_make gnustep_gui ];
-  dontBuild = true;
-
-  installPhase = ''
-    export ADDITIONAL_INCLUDE_DIRS=${GNUSTEP_env}/include
-    make \
-      GNUSTEP_SYSTEM_APPS=$GNUSTEP_env/lib/GNUstep/Applications \
-      GNUSTEP_SYSTEM_ADMIN_APPS=$GNUSTEP_env/lib/GNUstep/Applications \
-      GNUSTEP_SYSTEM_WEB_APPS=$GNUSTEP_env/lib/GNUstep/WebApplications \
-      GNUSTEP_SYSTEM_TOOLS=$GNUSTEP_env/bin \
-      GNUSTEP_SYSTEM_ADMIN_TOOLS=$GNUSTEP_env/sbin \
-      GNUSTEP_SYSTEM_LIBRARY=$GNUSTEP_env/lib/GNUstep \
-      GNUSTEP_SYSTEM_HEADERS=$GNUSTEP_env/include \
-      GNUSTEP_SYSTEM_LIBRARIES=$GNUSTEP_env/lib \
-      GNUSTEP_SYSTEM_DOC=$GNUSTEP_env/share/GNUstep/Documentation \
-      GNUSTEP_SYSTEM_DOC_MAN=$GNUSTEP_env/share/man \
-      GNUSTEP_SYSTEM_DOC_INFO=$GNUSTEP_env/share/info \
-      GNUSTEP_SYSTEM_LIBRARIES=$GNUSTEP_env/lib \
-      messages=yes
-    make install \
-      GNUSTEP_INSTALLATION_DOMAIN=SYSTEM \
-      GNUSTEP_SYSTEM_APPS=$out/lib/GNUstep/Applications \
-      GNUSTEP_SYSTEM_ADMIN_APPS=$out/lib/GNUstep/Applications \
-      GNUSTEP_SYSTEM_WEB_APPS=$out/lib/GNUstep/WebApplications \
-      GNUSTEP_SYSTEM_TOOLS=$out/bin \
-      GNUSTEP_SYSTEM_ADMIN_TOOLS=$out/sbin \
-      GNUSTEP_SYSTEM_LIBRARY=$out/lib/GNUstep \
-      GNUSTEP_SYSTEM_HEADERS=$out/include \
-      GNUSTEP_SYSTEM_LIBRARIES=$out/lib \
-      GNUSTEP_SYSTEM_DOC=$out/share/GNUstep/Documentation \
-      GNUSTEP_SYSTEM_DOC_MAN=$out/share/man \
-      GNUSTEP_SYSTEM_DOC_INFO=$out/share/info \
-      GNUSTEP_SYSTEM_LIBRARIES=$out/lib \
-      GNUSTEP_HEADERS=$out/include
-  '';
+#  patches = [ ./fixup-preamble.patch ];
+  deps = [ gnustep_base gnustep_back gnustep_gui ];
   
   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.";