gnustep: rescope everything into one folder

This should make merge conflicts easier to
handle. "gnustep" prefix has been removed to
make thing simpler. So "gnustep_make" is now
"make" within the gnustep scope.

6 files changed, 0 insertions, 159 deletions

diff --git a/pkgs/applications/editors/gorm/default.nix b/pkgs/applications/editors/gorm/default.nix
deleted file mode 100644
index d5633b5e97d2b..0000000000000
--- a/pkgs/applications/editors/gorm/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ stdenv, fetchurl, gnustep_base, gnustep_back, gsmakeDerivation, gnustep_gui
-}:
-let
-  version = "1.2.18";
-in
-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 ];
-  buildInputs = [ 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";
-
-    homepage = http://www.gnustep.org/experience/Gorm.html;
-
-    license = stdenv.lib.licenses.lgpl2Plus;
-
-    maintainers = with stdenv.lib.maintainers; [ ashalkhakov ];
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
\ No newline at end of file
diff --git a/pkgs/applications/editors/gorm/fix-gs-makefiles.patch b/pkgs/applications/editors/gorm/fix-gs-makefiles.patch
deleted file mode 100644
index cf395d32c6363..0000000000000
--- a/pkgs/applications/editors/gorm/fix-gs-makefiles.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -ru gorm-1.2.20/GNUmakefile gorm-1.2.20.patched/GNUmakefile
---- gorm-1.2.20/GNUmakefile	2010-05-30 12:55:26.000000000 +0600
-+++ gorm-1.2.20.patched/GNUmakefile	2014-12-10 22:21:18.000000000 +0600
-@@ -24,6 +24,23 @@
- #   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- #
- 
-+ifeq ($(GNUSTEP_MAKEFILES),)
-+ GNUSTEP_MAKEFILES := $(shell gnustep-config --variable=GNUSTEP_MAKEFILES 2>/dev/null)
-+  ifeq ($(GNUSTEP_MAKEFILES),)
-+    $(warning )
-+    $(warning Unable to obtain GNUSTEP_MAKEFILES setting from gnustep-config!)
-+    $(warning Perhaps gnustep-make is not properly installed,)
-+    $(warning so gnustep-config is not in your PATH.)
-+    $(warning )
-+    $(warning Your PATH is currently $(PATH))
-+    $(warning )
-+  endif
-+endif
-+
-+ifeq ($(GNUSTEP_MAKEFILES),)
-+  $(error You need to set GNUSTEP_MAKEFILES before compiling!)
-+endif
-+
- PACKAGE_NAME = gorm
- export PACKAGE_NAME
- include $(GNUSTEP_MAKEFILES)/common.make
-Only in gorm-1.2.20.patched/: GNUmakefile~
diff --git a/pkgs/applications/editors/projectcenter/default.nix b/pkgs/applications/editors/projectcenter/default.nix
deleted file mode 100644
index ccb885f7477b5..0000000000000
--- a/pkgs/applications/editors/projectcenter/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ stdenv, fetchurl
-, gnustep_base, gnustep_back, gsmakeDerivation, gnustep_gui, gorm
-, gnumake, gdb
-}:
-let
-  version = "0.6.2";
-in
-gsmakeDerivation {
-  name = "projectcenter-${version}";
-  src = fetchurl {
-    url = "ftp://ftp.gnustep.org/pub/gnustep/dev-apps/ProjectCenter-${version}.tar.gz";
-    sha256 = "0wwlbpqf541apw192jb633d634zkpjhcrrkd1j80y9hihphll465";
-  };
-
-  # NOTE: need a patch for ProjectCenter to help it locate some necessary tools:
-  # 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.";
-
-    homepage = http://www.gnustep.org/experience/ProjectCenter.html;
-
-    license = stdenv.lib.licenses.lgpl2Plus;
-  
-    maintainers = with stdenv.lib.maintainers; [ ashalkhakov ];
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
\ No newline at end of file
diff --git a/pkgs/applications/editors/projectcenter/fixup-preamble.patch b/pkgs/applications/editors/projectcenter/fixup-preamble.patch
deleted file mode 100644
index 3fe19a6a58b93..0000000000000
--- a/pkgs/applications/editors/projectcenter/fixup-preamble.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -c ProjectCenter-0.6.2/GNUmakefile.preamble ProjectCenter-0.6.2.patched/GNUmakefile.preamble
---- ProjectCenter-0.6.2/GNUmakefile.preamble	2010-08-08 03:56:04.000000000 +0600
-+++ artyom/ProjectCenter-0.6.2.patched/GNUmakefile.preamble	2014-12-01 20:08:31.000000000 +0600
-@@ -39,7 +39,7 @@
- ADDITIONAL_INCLUDE_DIRS += -I./ -I./Headers
- 
- # Additional LDFLAGS to pass to the linker
--ADDITIONAL_LDFLAGS += 
-+ADDITIONAL_LDFLAGS += -lgnustep-base -lgnustep-gui
- 
- # Additional library directories the linker should search
- ADDITIONAL_LIB_DIRS += -L./Framework/ProjectCenter.framework/$(GNUSTEP_TARGET_LDIR)
-
-Diff finished.  Mon Dec  1 20:08:50 2014
diff --git a/pkgs/applications/misc/gworkspace/default.nix b/pkgs/applications/misc/gworkspace/default.nix
deleted file mode 100644
index e59cde7e22e5b..0000000000000
--- a/pkgs/applications/misc/gworkspace/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ gnustep_back, gnustep_base, gnustep_gui, gsmakeDerivation
-, fetchurl
-, sqlite
-, stdenv
-, system_preferences
-}:
-let
-  version = "0.9.2";
-in
-gsmakeDerivation {
-  name = "gworkspace-${version}";
-  src = fetchurl {
-    url = "ftp://ftp.gnustep.org/pub/gnustep/usr-apps/gworkspace-${version}.tar.gz";
-    sha256 = "1yzlka2dl1gb353wf9kw6l26sdihdhgwvdfg5waqwdfl7ycfyfaj";
-  };
-  # additional dependencies:
-  # - PDFKit framework from http://gap.nongnu.org/
-  # - TODO: to --enable-gwmetadata, need libDBKit as well as sqlite!
-  buildInputs = [ 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";
-
-    homepage = http://www.gnustep.org/experience/GWorkspace.html;
-
-    license = stdenv.lib.licenses.lgpl2Plus;
-
-    maintainers = with stdenv.lib.maintainers; [ ashalkhakov ];
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/applications/misc/systempreferences/default.nix b/pkgs/applications/misc/systempreferences/default.nix
deleted file mode 100644
index 2dffdfe3df53d..0000000000000
--- a/pkgs/applications/misc/systempreferences/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ gnustep_back, gnustep_base, gnustep_gui, gsmakeDerivation
-, fetchurl
-, stdenv
-}:
-let
-  version = "1.1.0";
-in
-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";
-  buildInputs = [ 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";
-
-    homepage = http://www.gnustep.org/experience/systempreferences.html;
-
-    license = stdenv.lib.licenses.lgpl2Plus;
-
-    maintainers = with stdenv.lib.maintainers; [ ashalkhakov ];
-    platforms = stdenv.lib.platforms.linux;
-  };
-}