alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge #33311: meson: set checkPhase in setup hook

Browse source
This commit is contained in:
Vladimír Čunát 2018-01-07 11:28:46 +01:00
parent e527eb0373 d75f95d2a2
commit 49a45fb51f
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
12 changed files with 12 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
pkgs/applications/video/gnome-mpv/default.nix
View file

@ -26,7 +26,6 @@ stdenv.mkDerivation rec {
'';
doCheck = true;
checkPhase = "meson test";
meta = with stdenv.lib; {
description = "Simple GTK+ frontend for the mpv video player";

1
pkgs/desktops/gnome-3/apps/bijiben/default.nix
View file

@ -8,7 +8,6 @@ stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
doCheck = true;
checkPhase = "meson test";
patches = [
./no-update-icon-cache.patch

2
pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
View file

@ -18,8 +18,6 @@ stdenv.mkDerivation rec {
prePatch = "patchShebangs build-aux/";
checkPhase = "meson test";
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Clocks;
description = "Clock application designed for GNOME 3";

2
pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix
View file

@ -14,8 +14,6 @@ stdenv.mkDerivation rec {
desktop_file_utils appstream-glib libxslt docbook_xsl docbook_xml_dtd_43];
buildInputs = [ gtk glib gnome3.gsettings_desktop_schemas ];
checkPhase = "meson test";
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Dictionary;
description = "Dictionary is the GNOME application to look up definitions";

2
pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix
View file

@ -7,8 +7,6 @@ stdenv.mkDerivation rec {
doCheck = true;
checkPhase = "meson test";
nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook libxml2 ];
buildInputs = [ gtk3 glib gnome3.gnome_desktop gnome3.defaultIconTheme ];

3
pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix
View file

@ -7,9 +7,6 @@ stdenv.mkDerivation rec {
doCheck = true;
checkPhase = "meson test";
postPatch = ''
chmod +x build-aux/postinstall.py # patchShebangs requires executable file
patchShebangs build-aux/postinstall.py

2
pkgs/desktops/gnome-3/core/libgepub/default.nix
View file

@ -11,8 +11,6 @@ stdenv.mkDerivation rec {
doCheck = true;
checkPhase = "meson test";
nativeBuildInputs = [ meson ninja pkgconfig gobjectIntrospection ];
buildInputs = [ glib webkitgtk libsoup libxml2 libarchive ];

2
pkgs/desktops/gnome-3/core/simple-scan/default.nix
View file

@ -39,8 +39,6 @@ stdenv.mkDerivation rec {
doCheck = true;
checkPhase = "meson test";
meta = with stdenv.lib; {
description = "Simple scanning utility";
longDescription = ''

2
pkgs/desktops/gnome-3/core/totem/default.nix
View file

@ -27,8 +27,6 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ gobjectIntrospection python3Packages.pylint python3Packages.pygobject2 ];
checkPhase = "meson test";
patches = [
(fetchurl {
name = "remove-pycompile.patch";

2
pkgs/development/libraries/json-glib/default.nix
View file

@ -27,8 +27,6 @@ stdenv.mkDerivation rec {
doCheck = true;
checkPhase = "meson test";
meta = with stdenv.lib; {
homepage = http://live.gnome.org/JsonGlib;
description = "A library providing (de)serialization support for the JavaScript Object Notation (JSON) format";

2
pkgs/development/libraries/libinput/default.nix
View file

@ -50,8 +50,6 @@ stdenv.mkDerivation rec {
doCheck = testsSupport;
checkPhase = "meson test";
meta = {
description = "Handles input devices in Wayland compositors and provides a generic X.Org input driver";
homepage = http://www.freedesktop.org/wiki/Software/libinput;

12
pkgs/development/tools/build-managers/meson/setup-hook.sh
View file

@ -25,3 +25,15 @@ if [ -z "$dontUseMesonConfigure" -a -z "$configurePhase" ]; then
setOutputFlags=
configurePhase=mesonConfigurePhase
fi
mesonCheckPhase() {
runHook preCheck
meson test
runHook postCheck
}
if [ -z "$dontUseMesonCheck" -a -z "$checkPhase" ]; then
checkPhase=mesonCheckPhase
fi