Merge branch 'staging-next' into staging

2 files changed, 1 insertions, 41 deletions

diff --git a/pkgs/development/libraries/json-glib/default.nix b/pkgs/development/libraries/json-glib/default.nix
index e095945dabaac..1f8f4fd1acc06 100644
--- a/pkgs/development/libraries/json-glib/default.nix
+++ b/pkgs/development/libraries/json-glib/default.nix
@@ -4,7 +4,6 @@
 , glib
 , meson
 , ninja
-, nixosTests
 , pkg-config
 , gettext
 , gobject-introspection
@@ -18,18 +17,13 @@ stdenv.mkDerivation rec {
   pname = "json-glib";
   version = "1.6.6";
 
-  outputs = [ "out" "dev" "devdoc" "installedTests" ];
+  outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "luyYvnqR9t3jNjZyDj2i/27LuQ52zKpJSX8xpoVaSQ4=";
   };
 
-  patches = [
-    # Add option for changing installation path of installed tests.
-    ./meson-add-installed-tests-prefix-option.patch
-  ];
-
   strictDeps = true;
 
   depsBuildBuild = [
@@ -55,9 +49,6 @@ stdenv.mkDerivation rec {
     glib
   ];
 
-  mesonFlags = [
-    "-Dinstalled_test_prefix=${placeholder "installedTests"}"
-  ];
 
   # Run-time dependency gi-docgen found: NO (tried pkgconfig and cmake)
   # it should be a build-time dep for build
@@ -82,10 +73,6 @@ stdenv.mkDerivation rec {
   '';
 
   passthru = {
-    tests = {
-      installedTests = nixosTests.installed-tests.json-glib;
-    };
-
     updateScript = gnome.updateScript {
       packageName = pname;
       versionPolicy = "odd-unstable";
diff --git a/pkgs/development/libraries/json-glib/meson-add-installed-tests-prefix-option.patch b/pkgs/development/libraries/json-glib/meson-add-installed-tests-prefix-option.patch
deleted file mode 100644
index 626db09cd03f1..0000000000000
--- a/pkgs/development/libraries/json-glib/meson-add-installed-tests-prefix-option.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/json-glib/tests/meson.build b/json-glib/tests/meson.build
-index 1eb56c8..dca444e 100644
---- a/json-glib/tests/meson.build
-+++ b/json-glib/tests/meson.build
-@@ -21,8 +21,9 @@ test_data = [
-   'stream-load.json',
- ]
- 
--installed_test_bindir = join_paths(json_libexecdir, 'installed-tests', json_api_name)
--installed_test_datadir = join_paths(json_datadir, 'installed-tests', json_api_name)
-+installed_test_prefix = get_option('installed_test_prefix')
-+installed_test_bindir = join_paths(installed_test_prefix, 'libexec', 'installed-tests', json_api_name)
-+installed_test_datadir = join_paths(installed_test_prefix, 'share', 'installed-tests', json_api_name)
- 
- install_data(test_data, install_dir: installed_test_bindir)
- 
-diff --git a/meson_options.txt b/meson_options.txt
-index 068a03f..03f398a 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -10,3 +10,6 @@ option('man',
- option('tests',
-        type: 'boolean', value: true,
-        description: 'Build the tests')
-+option('installed_test_prefix',
-+       description: 'Prefix for installed tests',
-+       type: 'string')