From d75f95d2a25567948d98a6bd8da69c68a5c06d3f Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 2 Jan 2018 06:08:51 +0100
Subject: [PATCH] packages using meson: remove unnecessary checkPhase
---
pkgs/applications/video/gnome-mpv/default.nix | 1 -
pkgs/desktops/gnome-3/apps/bijiben/default.nix | 1 -
pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix | 2 --
pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix | 2 --
pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix | 2 --
pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix | 3 ---
pkgs/desktops/gnome-3/core/libgepub/default.nix | 2 --
pkgs/desktops/gnome-3/core/simple-scan/default.nix | 2 --
pkgs/desktops/gnome-3/core/totem/default.nix | 2 --
pkgs/development/libraries/json-glib/default.nix | 2 --
pkgs/development/libraries/libinput/default.nix | 2 --
11 files changed, 21 deletions(-)
diff --git a/pkgs/applications/video/gnome-mpv/default.nix b/pkgs/applications/video/gnome-mpv/default.nix
index 2f073d1731dc..b60d405d5b99 100644
--- a/pkgs/applications/video/gnome-mpv/default.nix
+++ b/pkgs/applications/video/gnome-mpv/default.nix
@@ -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";
diff --git a/pkgs/desktops/gnome-3/apps/bijiben/default.nix b/pkgs/desktops/gnome-3/apps/bijiben/default.nix
index ddff55c96a09..ca266d73fd35 100644
--- a/pkgs/desktops/gnome-3/apps/bijiben/default.nix
+++ b/pkgs/desktops/gnome-3/apps/bijiben/default.nix
@@ -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
diff --git a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
index df8c6befc603..5441f1e5edc9 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
@@ -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";
diff --git a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix
index 72d1602eee45..6cfdd45c2f9c 100644
--- a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix
@@ -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";
diff --git a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix
index cdf119d83a3c..dade56158fb1 100644
--- a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix
@@ -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 ];
diff --git a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix
index 69a967d6d247..5986b07229f5 100644
--- a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix
@@ -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
diff --git a/pkgs/desktops/gnome-3/core/libgepub/default.nix b/pkgs/desktops/gnome-3/core/libgepub/default.nix
index f1e13e10fd9e..10d676d11d63 100644
--- a/pkgs/desktops/gnome-3/core/libgepub/default.nix
+++ b/pkgs/desktops/gnome-3/core/libgepub/default.nix
@@ -11,8 +11,6 @@ stdenv.mkDerivation rec {
doCheck = true;
- checkPhase = "meson test";
-
nativeBuildInputs = [ meson ninja pkgconfig gobjectIntrospection ];
buildInputs = [ glib webkitgtk libsoup libxml2 libarchive ];
diff --git a/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/pkgs/desktops/gnome-3/core/simple-scan/default.nix
index a30467c1862d..4a3420ea5f5b 100644
--- a/pkgs/desktops/gnome-3/core/simple-scan/default.nix
+++ b/pkgs/desktops/gnome-3/core/simple-scan/default.nix
@@ -39,8 +39,6 @@ stdenv.mkDerivation rec {
doCheck = true;
- checkPhase = "meson test";
-
meta = with stdenv.lib; {
description = "Simple scanning utility";
longDescription = ''
diff --git a/pkgs/desktops/gnome-3/core/totem/default.nix b/pkgs/desktops/gnome-3/core/totem/default.nix
index 651b7cff226d..c26b9b45dfdf 100644
--- a/pkgs/desktops/gnome-3/core/totem/default.nix
+++ b/pkgs/desktops/gnome-3/core/totem/default.nix
@@ -27,8 +27,6 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ gobjectIntrospection python3Packages.pylint python3Packages.pygobject2 ];
- checkPhase = "meson test";
-
patches = [
(fetchurl {
name = "remove-pycompile.patch";
diff --git a/pkgs/development/libraries/json-glib/default.nix b/pkgs/development/libraries/json-glib/default.nix
index 2414931e76aa..73fa1f311bff 100644
--- a/pkgs/development/libraries/json-glib/default.nix
+++ b/pkgs/development/libraries/json-glib/default.nix
@@ -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";
diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix
index db4c0c7738de..a0f7807786ea 100644
--- a/pkgs/development/libraries/libinput/default.nix
+++ b/pkgs/development/libraries/libinput/default.nix
@@ -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;