BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #41365 from Anton-Latukha/migrateToMeson

Browse source 
at-spi2-atk, at-spi2-core, clutter-gtk, fribidi: updates, build with meson, adding updareScript
This commit is contained in:
Jan Tojnar 2018-06-08 12:31:23 +02:00 committed by GitHub
commit 2890ff777d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 83 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
pkgs/development/libraries/at-spi2-atk/default.nix
View file

@ -1,24 +1,43 @@
{ stdenv, fetchurl, python, pkgconfig, popt, atk, libX11, libICE, xorg, libXi
, intltool, dbus-glib, at-spi2-core, libSM }:
{ stdenv
, fetchurl
, meson
, ninja
, pkgconfig
, at-spi2-core
, atk
, dbus
, glib
, libxml2
, gnome3 # To pass updateScript
}:
stdenv.mkDerivation rec {
versionMajor = "2.26";
versionMinor = "1";
moduleName = "at-spi2-atk";
name = "${moduleName}-${versionMajor}.${versionMinor}";
name = "${pname}-${version}";
pname = "at-spi2-atk";
version = "2.26.2";
src = fetchurl {
url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
sha256 = "0x9vc99ni46fg5dzlx67vbw0zqffr24gz8jvbdxbmzyvc5xw5w5l";
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0vkan52ab9vrkknnv8y4f1cspk8x7xd10qx92xk9ys71p851z2b1";
};
nativeBuildInputs = [ pkgconfig intltool ];
buildInputs = [ python popt atk libX11 libICE xorg.libXtst libXi
dbus-glib at-spi2-core libSM ];
nativeBuildInputs = [ meson ninja pkgconfig ];
buildInputs = [ at-spi2-core atk dbus glib libxml2 ];
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;
};
}

49
pkgs/development/libraries/at-spi2-core/default.nix
View file

@ -1,31 +1,46 @@
{ stdenv, fetchurl, python, pkgconfig, popt, gettext, dbus-glib
, libX11, xextproto, libSM, libICE, libXtst, libXi, gobjectIntrospection }:
{ stdenv
, 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";
versionMinor = "2";
moduleName = "at-spi2-core";
name = "${moduleName}-${versionMajor}.${versionMinor}";
name = "${pname}-${version}";
pname = "at-spi2-core";
version = "2.28.0";
src = fetchurl {
url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
sha256 = "0596ghkamkxgv08r4a1pdhm06qd5zzgcfqsv64038w9xbvghq3n8";
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "11qwdxxx4jm0zj04xydlwah41axiz276dckkiql3rr0wn5x4i8j2";
};
outputs = [ "out" "dev" ];
nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection ];
buildInputs = [
python popt dbus-glib
libX11 xextproto libSM libICE libXtst libXi
];
nativeBuildInputs = [ meson ninja pkgconfig gobjectIntrospection ];
buildInputs = [ dbus glib libX11 libXtst libXi ];
# ToDo: on non-NixOS we create a symlink from there?
configureFlags = "--with-dbus-daemondir=/run/current-system/sw/bin/";
doCheck = false; # needs dbus daemon
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
};
};
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;
};
}

7
pkgs/development/libraries/clutter-gtk/default.nix
View file

@ -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";

26
pkgs/development/libraries/fribidi/default.nix
View file

@ -1,19 +1,23 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig }:
{ stdenv
, fetchurl
, meson
, ninja
, pkgconfig
}:
stdenv.mkDerivation rec {
name = "fribidi-${version}";
version = "0.19.7";
name = "${pname}-${version}";
pname = "fribidi";
version = "1.0.4";
src = fetchFromGitHub {
owner = "fribidi";
repo = "fribidi";
rev = version;
sha256 = "10q5jfch5qzrj2w4fbkr086ank66plx8hp7ra9a01irj80pbk96d";
# 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.
src = fetchurl {
url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${name}.tar.bz2";
sha256 = "1gipy8fjyn6i4qrhima02x8xs493d21f22dijp88nk807razxgcl";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
# Configure script checks for glib, but it is only used for tests.
nativeBuildInputs = [ meson ninja pkgconfig ];
outputs = [ "out" "devdoc" ];