From 1e663df66c172662f2e96b40965d2560383a5691 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 29 Jun 2016 20:05:48 +0000
Subject: [PATCH] gnustep: provide default meta

Meta data like maintainers, license, and homepage is shared throughout the
"gnustep" project. Everything going through "gsmakeDerivation" now
shares overridable metadata.
---
 pkgs/development/libraries/gnustep/back/default.nix  |  8 --------
 pkgs/development/libraries/gnustep/base/default.nix  |  8 --------
 pkgs/development/libraries/gnustep/gorm/default.nix  | 10 +---------
 pkgs/development/libraries/gnustep/gui/default.nix   | 12 +-----------
 .../libraries/gnustep/gworkspace/default.nix         |  7 -------
 .../libraries/gnustep/libobjc2/default.nix           | 11 ++++-------
 pkgs/development/libraries/gnustep/make/default.nix  |  2 +-
 .../libraries/gnustep/make/gsmakeDerivation.nix      | 12 ++++++++++--
 .../libraries/gnustep/projectcenter/default.nix      |  9 +--------
 .../libraries/gnustep/systempreferences/default.nix  | 12 +-----------
 pkgs/development/libraries/gnustep/xcode/default.nix |  6 +++---
 11 files changed, 22 insertions(+), 75 deletions(-)

diff --git a/pkgs/development/libraries/gnustep/back/default.nix b/pkgs/development/libraries/gnustep/back/default.nix
index 9bad56a747a..ba97a6b3d20 100644
--- a/pkgs/development/libraries/gnustep/back/default.nix
+++ b/pkgs/development/libraries/gnustep/back/default.nix
@@ -6,7 +6,6 @@
 , x11
 , freetype
 , pkgconfig
-, stdenv
 }:
 let
   version = "0.24.0";
@@ -20,12 +19,5 @@ gsmakeDerivation {
   buildInputs = [ cairo base gui freetype pkgconfig x11 ];
   meta = {
     description = "GNUstep-back is a generic backend for GNUstep.";
-    
-    homepage = http://gnustep.org/;
-
-    license = stdenv.lib.licenses.lgpl2Plus;
-
-    maintainers = with stdenv.lib.maintainers; [ ashalkhakov ];
-    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/gnustep/base/default.nix b/pkgs/development/libraries/gnustep/base/default.nix
index ae90aac6e23..150200abb6c 100644
--- a/pkgs/development/libraries/gnustep/base/default.nix
+++ b/pkgs/development/libraries/gnustep/base/default.nix
@@ -9,7 +9,6 @@
 , libobjc2, libgcrypt
 , icu
 , pkgconfig, portaudio
-, stdenv
 }:
 let
   version = "1.24.7";
@@ -35,12 +34,5 @@ gsmakeDerivation {
   patches = [ ./fixup-paths.patch ];
   meta = {
     description = "GNUstep-base is an implementation of AppKit and Foundation libraries of OPENSTEP and Cocoa.";
-
-    homepage = http://gnustep.org/;
-
-    license = stdenv.lib.licenses.lgpl2Plus;
-
-    maintainers = with stdenv.lib.maintainers; [ ashalkhakov ];
-    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/gnustep/gorm/default.nix b/pkgs/development/libraries/gnustep/gorm/default.nix
index 1b4e0464fb0..b655bd5b598 100644
--- a/pkgs/development/libraries/gnustep/gorm/default.nix
+++ b/pkgs/development/libraries/gnustep/gorm/default.nix
@@ -1,5 +1,4 @@
-{ stdenv, fetchurl, base, back, gsmakeDerivation, gui
-}:
+{ fetchurl, base, back, gsmakeDerivation, gui }:
 let
   version = "1.2.18";
 in
@@ -16,12 +15,5 @@ gsmakeDerivation {
 
   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;
   };
 }
diff --git a/pkgs/development/libraries/gnustep/gui/default.nix b/pkgs/development/libraries/gnustep/gui/default.nix
index 9fee627b19a..5859c42fafe 100644
--- a/pkgs/development/libraries/gnustep/gui/default.nix
+++ b/pkgs/development/libraries/gnustep/gui/default.nix
@@ -1,7 +1,4 @@
-{ gsmakeDerivation
-, fetchurl
-, base
-, stdenv }:
+{ gsmakeDerivation, fetchurl, base }:
 let
   version = "0.24.0";
 in
@@ -18,12 +15,5 @@ gsmakeDerivation {
   patches = [ ./fixup-all.patch ];
   meta = {
     description = "GNUstep-gui is a GUI class library of GNUstep.";
-    
-    homepage = http://gnustep.org/;
-
-    license = stdenv.lib.licenses.lgpl2Plus;
-
-    maintainers = with stdenv.lib.maintainers; [ ashalkhakov ];
-    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/gnustep/gworkspace/default.nix b/pkgs/development/libraries/gnustep/gworkspace/default.nix
index 538a34461a8..5bf49e6a22a 100644
--- a/pkgs/development/libraries/gnustep/gworkspace/default.nix
+++ b/pkgs/development/libraries/gnustep/gworkspace/default.nix
@@ -21,12 +21,5 @@ gsmakeDerivation {
   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/development/libraries/gnustep/libobjc2/default.nix b/pkgs/development/libraries/gnustep/libobjc2/default.nix
index a3f45b5cc23..3e3ebe7a2df 100644
--- a/pkgs/development/libraries/gnustep/libobjc2/default.nix
+++ b/pkgs/development/libraries/gnustep/libobjc2/default.nix
@@ -1,7 +1,4 @@
-{ stdenv, fetchurl,
-  clang,
-  cmake
-}:
+{ stdenv, fetchurl, cmake }:
 
 let
   version = "1.7";
@@ -12,7 +9,7 @@ stdenv.mkDerivation rec {
     url = "http://download.gna.org/gnustep/libobjc2-1.7.tar.bz2";
     sha256 = "1h9wkm1x9wrzd3alm99bx710lrs9nb8h2x5jpxbqwgbgzzv4l6rs";
   };
-  buildInputs = [ clang cmake ];
+  buildInputs = [ cmake ];
 
   # since we don't support Objective-C++, we don't interoperate
   # with C++ either
@@ -43,7 +40,7 @@ stdenv.mkDerivation rec {
   
     license = stdenv.lib.licenses.mit;
   
-    maintainers = with stdenv.lib.maintainers; [ ashalkhakov ];
+    maintainers = with stdenv.lib.maintainers; [ ashalkhakov matthewbauer ];
     platforms = stdenv.lib.platforms.all;
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/libraries/gnustep/make/default.nix b/pkgs/development/libraries/gnustep/make/default.nix
index 5b193293276..beabe8865e3 100644
--- a/pkgs/development/libraries/gnustep/make/default.nix
+++ b/pkgs/development/libraries/gnustep/make/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
     license = stdenv.lib.licenses.lgpl2Plus;
 
-    maintainers = with stdenv.lib.maintainers; [ ashalkhakov ];
+    maintainers = with stdenv.lib.maintainers; [ ashalkhakov matthewbauer ];
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/gnustep/make/gsmakeDerivation.nix b/pkgs/development/libraries/gnustep/make/gsmakeDerivation.nix
index 51e26f3a694..a477bc2fb3a 100644
--- a/pkgs/development/libraries/gnustep/make/gsmakeDerivation.nix
+++ b/pkgs/development/libraries/gnustep/make/gsmakeDerivation.nix
@@ -1,6 +1,5 @@
 { stdenv, lib, libobjc2, clang, make, makeWrapper, which }:
-{ buildInputs ? []
-, ...} @ args:
+{ buildInputs ? [], ...} @ args:
 stdenv.mkDerivation (args // {
   buildInputs = [ makeWrapper make which ] ++ buildInputs;
 
@@ -8,4 +7,13 @@ stdenv.mkDerivation (args // {
   setupHook = ./setup-hook.sh;
 
   GNUSTEP_MAKEFILES = "${make}/share/GNUstep/Makefiles";
+
+  meta = {
+    homepage = http://gnustep.org/;
+
+    license = stdenv.lib.licenses.lgpl2Plus;
+
+    maintainers = with stdenv.lib.maintainers; [ ashalkhakov matthewbauer ];
+    platforms = stdenv.lib.platforms.linux;
+  } // (if builtins.hasAttr "meta" args then args.meta else {});
 })
diff --git a/pkgs/development/libraries/gnustep/projectcenter/default.nix b/pkgs/development/libraries/gnustep/projectcenter/default.nix
index 0e0237c0db0..5c54accb6cf 100644
--- a/pkgs/development/libraries/gnustep/projectcenter/default.nix
+++ b/pkgs/development/libraries/gnustep/projectcenter/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ fetchurl
 , base, back, gsmakeDerivation, gui, gorm
 , gnumake, gdb
 }:
@@ -19,12 +19,5 @@ gsmakeDerivation {
   
   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;
   };
 }
diff --git a/pkgs/development/libraries/gnustep/systempreferences/default.nix b/pkgs/development/libraries/gnustep/systempreferences/default.nix
index 90f91234b62..bf2ed64a85c 100644
--- a/pkgs/development/libraries/gnustep/systempreferences/default.nix
+++ b/pkgs/development/libraries/gnustep/systempreferences/default.nix
@@ -1,7 +1,4 @@
-{ back, base, gui, gsmakeDerivation
-, fetchurl
-, stdenv
-}:
+{ back, base, gui, gsmakeDerivation, fetchurl }:
 let
   version = "1.1.0";
 in
@@ -16,12 +13,5 @@ gsmakeDerivation {
 #  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;
   };
 }
diff --git a/pkgs/development/libraries/gnustep/xcode/default.nix b/pkgs/development/libraries/gnustep/xcode/default.nix
index e709f8b453c..b576f86705e 100644
--- a/pkgs/development/libraries/gnustep/xcode/default.nix
+++ b/pkgs/development/libraries/gnustep/xcode/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, make, libobjc2, base }:
+{ gsmakeDerivation, fetchFromGitHub, make, libobjc2, base }:
 
-stdenv.mkDerivation rec {
+gsmakeDerivation rec {
   name = "xcode-${version}";
   version = "1.0";
 
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
 
   installFlags = "DESTDIR=$(out)";
 
-  buildInputs = [ make libobjc2 base ];
+  buildInputs = [ libobjc2 base ];
 
   src = fetchFromGitHub {
     owner = "gnustep";