diff options
author | Artyom Shalkhakov <artyom.shalkhakov@gmail.com> | 2015-01-25 22:34:52 +0600 |
---|---|---|
committer | Matthew Bauer <mjbauer95@gmail.com> | 2016-08-16 21:00:27 +0000 |
commit | d3d580ebbe1ef6330f194ed5fd9116030bd09025 (patch) | |
tree | d1be6e38a4e431610c3f906360754c214e3f43ba /pkgs/applications | |
parent | 9b17cd8fab54b8a06e32109299e4102fcdf3d53d (diff) |
gnustep: cleanup
Major clean-up. Everything builds fine.
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/editors/gorm/default.nix | 10 | ||||
-rw-r--r-- | pkgs/applications/editors/projectcenter/default.nix | 12 | ||||
-rw-r--r-- | pkgs/applications/misc/gworkspace/default.nix | 9 | ||||
-rw-r--r-- | pkgs/applications/misc/systempreferences/default.nix | 10 |
4 files changed, 22 insertions, 19 deletions
diff --git a/pkgs/applications/editors/gorm/default.nix b/pkgs/applications/editors/gorm/default.nix index aaa3128934157..d5633b5e97d2b 100644 --- a/pkgs/applications/editors/gorm/default.nix +++ b/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 ]; - buildInputs = [ gnustep_make gnustep_base gnustep_back gnustep_gui ]; - propagatedBuildInputs = [ gnustep_base gnustep_back gnustep_gui ]; +# 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"; diff --git a/pkgs/applications/editors/projectcenter/default.nix b/pkgs/applications/editors/projectcenter/default.nix index 2de8df9bf29ab..ccb885f7477b5 100644 --- a/pkgs/applications/editors/projectcenter/default.nix +++ b/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 ]; - propagatedBuildInputs = [ gnustep_base gnustep_back gnustep_gui ]; + # 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."; diff --git a/pkgs/applications/misc/gworkspace/default.nix b/pkgs/applications/misc/gworkspace/default.nix index f041bd6d6b797..e59cde7e22e5b 100644 --- a/pkgs/applications/misc/gworkspace/default.nix +++ b/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_make gnustep_gui system_preferences ]; - propagatedBuildInputs = [ gnustep_back gnustep_base gnustep_gui system_preferences ]; + 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"; diff --git a/pkgs/applications/misc/systempreferences/default.nix b/pkgs/applications/misc/systempreferences/default.nix index 13d4312213b7b..2dffdfe3df53d 100644 --- a/pkgs/applications/misc/systempreferences/default.nix +++ b/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"; - buildInputs = [ gnustep_back gnustep_base gnustep_make gnustep_gui ]; - propagatedBuildInputs = [ gnustep_back gnustep_base gnustep_gui ]; +# 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"; |