Merge pull request #41365 from Anton-Latukha/migrateToMeson

at-spi2-atk, at-spi2-core, clutter-gtk, fribidi: updates, build with meson, adding updareScript

pkgs/development/libraries/at-spi2-atk/default.nix

@@ -1,24 +1,43 @@
-{ stdenv, fetchurl, python, pkgconfig, popt, atk, libX11, libICE, xorg, libXi
+{ stdenv
-, intltool, dbus-glib, at-spi2-core, libSM }:
+, fetchurl
+
+, meson
+, ninja
+, pkgconfig
+
+, at-spi2-core
+, atk
+, dbus
+, glib
+, libxml2
+
+, gnome3 # To pass updateScript
+}:
 
 stdenv.mkDerivation rec {
-  versionMajor = "2.26";
+  name = "${pname}-${version}";
-  versionMinor = "1";
+  pname = "at-spi2-atk";
-  moduleName   = "at-spi2-atk";
+  version = "2.26.2";
-  name = "${moduleName}-${versionMajor}.${versionMinor}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "0x9vc99ni46fg5dzlx67vbw0zqffr24gz8jvbdxbmzyvc5xw5w5l";
+    sha256 = "0vkan52ab9vrkknnv8y4f1cspk8x7xd10qx92xk9ys71p851z2b1";
   };
 
-  nativeBuildInputs = [ pkgconfig intltool ];
+  nativeBuildInputs = [ meson ninja pkgconfig ];
-  buildInputs = [ python popt atk libX11 libICE xorg.libXtst libXi
+  buildInputs = [ at-spi2-core atk dbus glib libxml2 ];
-                  dbus-glib at-spi2-core libSM ];
 
-  doCheck = false; # needs dbus daemon
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+    };
+  };
 
   meta = with stdenv.lib; {
+    description = "D-Bus bridge for Assistive Technology Service Provider Interface (AT-SPI) and Accessibility Toolkit (ATK)";
+    homepage = https://gitlab.gnome.org/GNOME/at-spi2-atk;
+    license = licenses.lgpl2Plus; # NOTE: 2018-06-06: Please check the license when upstream sorts-out licensing: https://gitlab.gnome.org/GNOME/at-spi2-atk/issues/2
+    maintainers = with maintainers; [ jtojnar gnome3.maintainers ];
     platforms = platforms.unix;
   };
 }

pkgs/development/libraries/at-spi2-core/default.nix

@@ -1,31 +1,46 @@
-{ stdenv, fetchurl, python, pkgconfig, popt, gettext, dbus-glib
+{ stdenv
-, libX11, xextproto, libSM, libICE, libXtst, libXi, gobjectIntrospection }:
+, fetchurl
+
+, meson
+, ninja
+, pkgconfig
+, gobjectIntrospection
+
+, dbus
+, glib
+, libX11
+, libXtst # at-spi2-core can be build without X support, but due it is a client-side library, GUI-less usage is a very rare case
+, libXi
+
+, gnome3 # To pass updateScript
+}:
 
 stdenv.mkDerivation rec {
-  versionMajor = "2.26";
+  name = "${pname}-${version}";
-  versionMinor = "2";
+  pname = "at-spi2-core";
-  moduleName   = "at-spi2-core";
+  version = "2.28.0";
-  name = "${moduleName}-${versionMajor}.${versionMinor}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "0596ghkamkxgv08r4a1pdhm06qd5zzgcfqsv64038w9xbvghq3n8";
+    sha256 = "11qwdxxx4jm0zj04xydlwah41axiz276dckkiql3rr0wn5x4i8j2";
   };
 
   outputs = [ "out" "dev" ];
 
-  nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection ];
+  nativeBuildInputs = [ meson ninja pkgconfig gobjectIntrospection ];
-  buildInputs = [
+  buildInputs = [ dbus glib libX11 libXtst libXi ];
-    python popt dbus-glib
-    libX11 xextproto libSM libICE libXtst libXi
-  ];
 
-  # ToDo: on non-NixOS we create a symlink from there?
+  passthru = {
-  configureFlags = "--with-dbus-daemondir=/run/current-system/sw/bin/";
+    updateScript = gnome3.updateScript {
-
+      packageName = pname;
-  doCheck = false; # needs dbus daemon
+    };
+  };
 
   meta = with stdenv.lib; {
+    description = "Assistive Technology Service Provider Interface protocol definitions and daemon for D-Bus";
+    homepage = https://gitlab.gnome.org/GNOME/at-spi2-core;
+    license = licenses.lgpl2Plus; # NOTE: 2018-06-06: Please check the license when upstream sorts-out licensing: https://gitlab.gnome.org/GNOME/at-spi2-core/issues/2
+    maintainers = with maintainers; [ jtojnar gnome3.maintainers ];
     platforms = platforms.unix;
   };
 }

pkgs/development/libraries/clutter-gtk/default.nix

@@ -1,8 +1,11 @@
-{ fetchurl, stdenv, pkgconfig, gobjectIntrospection, clutter, gtk3, gnome3 }:
+{ fetchurl, stdenv, pkgconfig, meson, ninja
+, gobjectIntrospection, clutter, gtk3, gnome3 }:
+
 let
   pname = "clutter-gtk";
   version = "1.8.4";
 in
+
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
@@ -12,7 +15,7 @@ stdenv.mkDerivation rec {
   };
 
   propagatedBuildInputs = [ clutter gtk3 ];
-  nativeBuildInputs = [ pkgconfig gobjectIntrospection ];
+  nativeBuildInputs = [ meson ninja pkgconfig gobjectIntrospection ];
 
   postBuild = "rm -rf $out/share/gtk-doc";
 

pkgs/development/libraries/fribidi/default.nix

@@ -1,19 +1,23 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig }:
+{ stdenv
+, fetchurl
+
+, meson
+, ninja
+, pkgconfig
+}:
 
 stdenv.mkDerivation rec {
-  name = "fribidi-${version}";
+  name = "${pname}-${version}";
-  version = "0.19.7";
+  pname = "fribidi";
+  version = "1.0.4";
 
-  src = fetchFromGitHub {
+  # NOTE: 2018-06-06 v1.0.4: Only URL tarball has "Have pre-generated man pages: true", which works-around upstream usage of some rare ancient `c2man` fossil application.
-    owner = "fribidi";
+  src = fetchurl {
-    repo = "fribidi";
+    url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${name}.tar.bz2";
-    rev = version;
+    sha256 = "1gipy8fjyn6i4qrhima02x8xs493d21f22dijp88nk807razxgcl";
-    sha256 = "10q5jfch5qzrj2w4fbkr086ank66plx8hp7ra9a01irj80pbk96d";
   };
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  nativeBuildInputs = [ meson ninja pkgconfig ];
-
-  # Configure script checks for glib, but it is only used for tests.
 
   outputs = [ "out" "devdoc" ];