summary refs log tree commit diff
diff options
context:
space:
mode:
authorBobby Rong <rjl931189261@126.com>2022-02-25 20:09:27 +0800
committerBobby Rong <rjl931189261@126.com>2022-03-02 11:28:29 +0800
commitb3d4c1d48f4bb8ac17ff5252707f960c0a06a07f (patch)
tree93c64dcbd3cdef7fedc943f934206ded0569ced4
parentc942cd7b2eac6e2851b7b603f46e1347bf681e10 (diff)
downloadnixpkgs-b3d4c1d48f4bb8ac17ff5252707f960c0a06a07f.tar
nixpkgs-b3d4c1d48f4bb8ac17ff5252707f960c0a06a07f.tar.gz
nixpkgs-b3d4c1d48f4bb8ac17ff5252707f960c0a06a07f.tar.bz2
nixpkgs-b3d4c1d48f4bb8ac17ff5252707f960c0a06a07f.tar.lz
nixpkgs-b3d4c1d48f4bb8ac17ff5252707f960c0a06a07f.tar.xz
nixpkgs-b3d4c1d48f4bb8ac17ff5252707f960c0a06a07f.tar.zst
nixpkgs-b3d4c1d48f4bb8ac17ff5252707f960c0a06a07f.zip
nixosTests.installed-tests.appstream-qt: init
-rw-r--r--nixos/tests/installed-tests/appstream-qt.nix9
-rw-r--r--nixos/tests/installed-tests/default.nix1
-rw-r--r--pkgs/development/libraries/appstream/qt.nix10
3 files changed, 18 insertions, 2 deletions
diff --git a/nixos/tests/installed-tests/appstream-qt.nix b/nixos/tests/installed-tests/appstream-qt.nix
new file mode 100644
index 00000000000..d08187bfe46
--- /dev/null
+++ b/nixos/tests/installed-tests/appstream-qt.nix
@@ -0,0 +1,9 @@
+{ pkgs, makeInstalledTest, ... }:
+
+makeInstalledTest {
+  tested = pkgs.libsForQt5.appstream-qt;
+
+  testConfig = {
+    appstream.enable = true;
+  };
+}
diff --git a/nixos/tests/installed-tests/default.nix b/nixos/tests/installed-tests/default.nix
index e6e1386a373..079fd54e71e 100644
--- a/nixos/tests/installed-tests/default.nix
+++ b/nixos/tests/installed-tests/default.nix
@@ -85,6 +85,7 @@ in
 
 {
   appstream = callInstalledTest ./appstream.nix {};
+  appstream-qt = callInstalledTest ./appstream-qt.nix {};
   colord = callInstalledTest ./colord.nix {};
   flatpak = callInstalledTest ./flatpak.nix {};
   flatpak-builder = callInstalledTest ./flatpak-builder.nix {};
diff --git a/pkgs/development/libraries/appstream/qt.nix b/pkgs/development/libraries/appstream/qt.nix
index 0bcb4741ff1..6a673a0a264 100644
--- a/pkgs/development/libraries/appstream/qt.nix
+++ b/pkgs/development/libraries/appstream/qt.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, appstream, qtbase, qttools }:
+{ mkDerivation, appstream, qtbase, qttools, nixosTests }:
 
 # TODO: look into using the libraries from the regular appstream derivation as we keep duplicates here
 
@@ -6,7 +6,7 @@ mkDerivation {
   pname = "appstream-qt";
   inherit (appstream) version src patches;
 
-  outputs = [ "out" "dev" ];
+  outputs = [ "out" "dev" "installedTests" ];
 
   buildInputs = appstream.buildInputs ++ [ appstream qtbase ];
 
@@ -19,6 +19,12 @@ mkDerivation {
       -e "/INTERFACE_INCLUDE_DIRECTORIES/ s@\''${PACKAGE_PREFIX_DIR}@$dev@"
   '';
 
+  passthru = appstream.passthru // {
+    tests = {
+      installed-tests = nixosTests.installed-tests.appstream-qt;
+    };
+  };
+
   meta = appstream.meta // {
     description = "Software metadata handling library - Qt";
  };