diff options
author | Artyom Shalkhakov <artyom.shalkhakov@gmail.com> | 2014-12-10 22:28:55 +0600 |
---|---|---|
committer | Matthew Bauer <mjbauer95@gmail.com> | 2016-08-16 20:59:50 +0000 |
commit | ea3dcb3264e8b8d6f6b9b257ed44f55ce92ff274 (patch) | |
tree | af5abe14e2603fe0d66a1a7e298751f609c741bc /pkgs/applications | |
parent | 4cbeef463c53877f9756d02d81bfd93fe187ccd0 (diff) |
gnustep: add setup hook for make
Adding a setup-hook for gnustep-make.
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/editors/gorm/default.nix | 12 | ||||
-rw-r--r-- | pkgs/applications/editors/gorm/fix-gs-makefiles.patch | 28 | ||||
-rw-r--r-- | pkgs/applications/editors/projectcenter/default.nix | 15 |
3 files changed, 40 insertions, 15 deletions
diff --git a/pkgs/applications/editors/gorm/default.nix b/pkgs/applications/editors/gorm/default.nix index 571c4f1b55e0a..aaa3128934157 100644 --- a/pkgs/applications/editors/gorm/default.nix +++ b/pkgs/applications/editors/gorm/default.nix @@ -1,17 +1,18 @@ -{ buildEnv -, stdenv, fetchurl, gnustep_builder, gnustep_base, gnustep_back, gnustep_gui +{ stdenv, fetchurl, gnustep_base, gnustep_back, gnustep_make, gnustep_gui }: let version = "1.2.18"; in -gnustep_builder.mkDerivation rec { +stdenv.mkDerivation rec { name = "gorm-${version}"; src = fetchurl { url = "ftp://ftp.gnustep.org/pub/gnustep/dev-apps/gorm-${version}.tar.gz"; sha256 = "1vpzvmsnynlq5dv6rw9vbk1zzsim6z7b2kprrlm8dknyq0r1sdrq"; }; - deps = [ gnustep_base gnustep_back gnustep_gui ]; + patches = [ ./fix-gs-makefiles.patch ]; + buildInputs = [ gnustep_make 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"; @@ -21,7 +22,6 @@ gnustep_builder.mkDerivation rec { license = stdenv.lib.licenses.lgpl2Plus; maintainers = with stdenv.lib.maintainers; [ ashalkhakov ]; - platforms = stdenv.lib.platforms.all; - broken = true; + 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 new file mode 100644 index 0000000000000..cf395d32c6363 --- /dev/null +++ b/pkgs/applications/editors/gorm/fix-gs-makefiles.patch @@ -0,0 +1,28 @@ +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 index a52a2cf70e3e4..2de8df9bf29ab 100644 --- a/pkgs/applications/editors/projectcenter/default.nix +++ b/pkgs/applications/editors/projectcenter/default.nix @@ -1,20 +1,18 @@ -{ buildEnv -, stdenv, fetchurl -, gnustep_builder -, gnustep_base, gnustep_back, gnustep_gui +{ stdenv, fetchurl +, gnustep_base, gnustep_back, gnustep_make, gnustep_gui }: let version = "0.6.2"; in -gnustep_builder.mkDerivation rec { +stdenv.mkDerivation rec { name = "projectcenter-${version}"; src = fetchurl { url = "ftp://ftp.gnustep.org/pub/gnustep/dev-apps/ProjectCenter-${version}.tar.gz"; sha256 = "0wwlbpqf541apw192jb633d634zkpjhcrrkd1j80y9hihphll465"; }; -# patches = [ ./fixup-preamble.patch ]; - deps = [ gnustep_base gnustep_back gnustep_gui ]; + buildInputs = [ gnustep_make gnustep_base gnustep_back gnustep_gui ]; + propagatedBuildInputs = [ 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."; @@ -24,7 +22,6 @@ gnustep_builder.mkDerivation rec { license = stdenv.lib.licenses.lgpl2Plus; maintainers = with stdenv.lib.maintainers; [ ashalkhakov ]; - platforms = stdenv.lib.platforms.all; - broken = true; + platforms = stdenv.lib.platforms.linux; }; } \ No newline at end of file |