From 72110f58b83fdd553f537239459a97f34541d6ef Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Fri, 1 Jun 2018 18:36:06 +0300 Subject: [PATCH] at-spi2-core: build with meson --- pkgs/development/libraries/at-spi2-core/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix index b7547c29392..051083136a3 100644 --- a/pkgs/development/libraries/at-spi2-core/default.nix +++ b/pkgs/development/libraries/at-spi2-core/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, python, pkgconfig, popt, gettext, dbus-glib +{ stdenv, fetchurl, pkgconfig, gettext, meson, ninja +, python, popt, dbus-glib , libX11, xextproto, libSM, libICE, libXtst, libXi, gobjectIntrospection }: stdenv.mkDerivation rec { @@ -14,15 +15,12 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection ]; + nativeBuildInputs = [ meson ninja pkgconfig gettext gobjectIntrospection ]; buildInputs = [ python popt dbus-glib libX11 xextproto libSM libICE 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 meta = with stdenv.lib; {