Merge 'staging' into closure-size

- there were many easy merge conflicts
- cc-wrapper needed nontrivial changes

Many other problems might've been created by interaction of the branches,
but stdenv and a few other packages build fine now.

1 files changed, 32 insertions, 0 deletions

diff --git a/pkgs/development/libraries/libgsystem/default.nix b/pkgs/development/libraries/libgsystem/default.nix
new file mode 100644
index 00000000000..b37503df5d9
--- /dev/null
+++ b/pkgs/development/libraries/libgsystem/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk_doc, gobjectIntrospection
+, glib, attr, systemd
+}:
+
+stdenv.mkDerivation {
+  name = "libgsystem-2015.1";
+
+  meta = with stdenv.lib; {
+    description = "GIO-based library with Unix/Linux specific API";
+    homepage    = "https://wiki.gnome.org/Projects/LibGSystem";
+    license     = licenses.lgpl2Plus;
+    platforms   = platforms.linux;
+    maintainers = with maintainers; [ iyzsong ];
+  };
+
+  src = fetchFromGitHub {
+    owner = "GNOME";
+    repo = "libgsystem";
+    rev = "v2015.1";
+    sha256 = "0j5dqn1pnspfxifklw4wkikqlbxr4faib07550n5gi58m89gg68n";
+  };
+
+  nativeBuildInputs = [
+    autoreconfHook pkgconfig gtk_doc gobjectIntrospection
+  ];
+
+  propagatedBuildInputs = [ glib attr systemd ];
+
+  preAutoreconf = ''
+    mkdir m4
+  '';
+}