public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #43700 from oxij/tree/more-test-fixes

Browse Source 
treewide: more fixes to tests
This commit is contained in:
Matthew Bauer 2018-07-23 11:05:09 -04:00 committed by GitHub
commit 856743f117
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/at-spi2-atk/default.nix
View File

@ -27,6 +27,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ meson ninja pkgconfig ]; nativeBuildInputs = [ meson ninja pkgconfig ];
buildInputs = [ at-spi2-core atk dbus glib libxml2 ]; buildInputs = [ at-spi2-core atk dbus glib libxml2 ];
doCheck = false; # fails with "No test data file provided"
passthru = { passthru = {
updateScript = gnome3.updateScript { updateScript = gnome3.updateScript {
packageName = pname; packageName = pname;

2
pkgs/development/libraries/at-spi2-core/default.nix
View File

@ -30,6 +30,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ meson ninja pkgconfig gobjectIntrospection ]; nativeBuildInputs = [ meson ninja pkgconfig gobjectIntrospection ];
buildInputs = [ dbus glib libX11 libXtst libXi ]; buildInputs = [ dbus glib libX11 libXtst libXi ];
doCheck = false; # fails with "AT-SPI: Couldn't connect to accessibility bus. Is at-spi-bus-launcher running?"
passthru = { passthru = {
updateScript = gnome3.updateScript { updateScript = gnome3.updateScript {
packageName = pname; packageName = pname;

9
pkgs/development/libraries/fribidi/default.nix
View File

@ -5,6 +5,7 @@
, ninja , ninja
, pkgconfig , pkgconfig
, fixDarwinDylibNames , fixDarwinDylibNames
, python3
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -12,16 +13,22 @@ stdenv.mkDerivation rec {
pname = "fribidi"; pname = "fribidi";
version = "1.0.4"; version = "1.0.4";
outputs = [ "out" "devdoc" ];
# 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. # 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 { src = fetchurl {
url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${name}.tar.bz2"; url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${name}.tar.bz2";
sha256 = "1gipy8fjyn6i4qrhima02x8xs493d21f22dijp88nk807razxgcl"; sha256 = "1gipy8fjyn6i4qrhima02x8xs493d21f22dijp88nk807razxgcl";
}; };
postPatch = ''
patchShebangs test
'';
nativeBuildInputs = [ meson ninja pkgconfig ]; nativeBuildInputs = [ meson ninja pkgconfig ];
buildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; buildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
outputs = [ "out" "devdoc" ]; checkInptus = [ python3 ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://github.com/fribidi/fribidi; homepage = https://github.com/fribidi/fribidi;

2
pkgs/development/libraries/libnice/default.nix
View File

@ -12,6 +12,8 @@ stdenv.mkDerivation rec {
buildInputs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base gnutls ]; buildInputs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base gnutls ];
propagatedBuildInputs = [ glib gupnp-igd ]; propagatedBuildInputs = [ glib gupnp-igd ];
doCheck = false; # fails with "fatal error: nice/agent.h: No such file or directory"
meta = { meta = {
homepage = https://nice.freedesktop.org/wiki/; homepage = https://nice.freedesktop.org/wiki/;
description = "The GLib ICE implementation"; description = "The GLib ICE implementation";

9
pkgs/development/libraries/librdf/default.nix
View File

@ -1,5 +1,6 @@
{ stdenv, fetchurl, pkgconfig, autoreconfHook { stdenv, fetchurl, pkgconfig, autoreconfHook
, librdf_raptor2, ladspaH, openssl, zlib , librdf_raptor2, ladspaH, openssl, zlib
, doCheck ? stdenv.config.doCheckByDefault or false, ladspaPlugins
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -11,14 +12,18 @@ stdenv.mkDerivation rec {
sha256 = "18p2flb2sv2hq6w2qkd29z9c7knnwqr3f12i2srshlzx6vwkm05s"; sha256 = "18p2flb2sv2hq6w2qkd29z9c7knnwqr3f12i2srshlzx6vwkm05s";
}; };
preAutoreconf = "rm m4/*"; postPatch = stdenv.lib.optionalString doCheck ''
postPatch = "sed -i -e 's:usr/local:usr:' examples/{instances,remove}_test.c"; sed -i -e 's:usr/local:${ladspaPlugins}:' examples/{instances,remove}_test.c
'';
preAutoreconf = "rm m4/*";
nativeBuildInputs = [ autoreconfHook pkgconfig ]; nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ ladspaH openssl zlib ]; buildInputs = [ ladspaH openssl zlib ];
propagatedBuildInputs = [ librdf_raptor2 ]; propagatedBuildInputs = [ librdf_raptor2 ];
inherit doCheck;
meta = { meta = {
description = "Lightweight RDF library with special support for LADSPA plugins"; description = "Lightweight RDF library with special support for LADSPA plugins";
homepage = https://sourceforge.net/projects/lrdf/; homepage = https://sourceforge.net/projects/lrdf/;