Merge branch 'master' into staging

2018-03-24 01:34:53 -04:00
parent 5d116251db 34087d0dec
commit 0f854cd2d1
141 changed files with 2752 additions and 1454 deletions
@@ -1,9 +1,12 @@
-{ stdenv, fetchurl, meson, ninja, gettext, pkgconfig, glib, gobjectIntrospection, gnome3 }:
+{ stdenv, fetchurl, meson, ninja, gettext, pkgconfig, glib
+, fixDarwinDylibNames, gobjectIntrospection, gnome3
+}:

 let
  pname = "atk";
  version = "2.28.1";
 in
+
 stdenv.mkDerivation rec {
  name = "${pname}-${version}";

@@ -22,6 +25,8 @@ stdenv.mkDerivation rec {

  outputs = [ "out" "dev" ];

+  buildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
+
  nativeBuildInputs = [ meson ninja pkgconfig gettext gobjectIntrospection ];

  propagatedBuildInputs = [