summary refs log tree commit diff
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2022-09-07 23:50:58 +0200
committerJan Tojnar <jtojnar@gmail.com>2022-10-11 18:52:13 +0200
commitb8e21f065b9eb4dbd3c9932dcfc4d6e76c467245 (patch)
treeb4ef74d0b64265e6a74bb8c28c9d64a9ff70ce86
parentb997f0625163b874eaf1c88349106b82a53c76d7 (diff)
downloadnixpkgs-b8e21f065b9eb4dbd3c9932dcfc4d6e76c467245.tar
nixpkgs-b8e21f065b9eb4dbd3c9932dcfc4d6e76c467245.tar.gz
nixpkgs-b8e21f065b9eb4dbd3c9932dcfc4d6e76c467245.tar.bz2
nixpkgs-b8e21f065b9eb4dbd3c9932dcfc4d6e76c467245.tar.lz
nixpkgs-b8e21f065b9eb4dbd3c9932dcfc4d6e76c467245.tar.xz
nixpkgs-b8e21f065b9eb4dbd3c9932dcfc4d6e76c467245.tar.zst
nixpkgs-b8e21f065b9eb4dbd3c9932dcfc4d6e76c467245.zip
librsvg: remove installed tests
Build will start failing with the following error in 2.55.1 due to `/build/librsvg-2.55.1/.libs` ending up in rpath:

    RPATH of binary /nix/store/78k70limslvxs6y98hdirbcixl3car1q-librsvg-2.55.1-installedTests/libexec/installed-tests/RSVG/api contains a forbidden reference to /build/
-rw-r--r--nixos/tests/installed-tests/default.nix1
-rw-r--r--nixos/tests/installed-tests/librsvg.nix9
-rw-r--r--pkgs/development/libraries/librsvg/default.nix13
3 files changed, 1 insertions, 22 deletions
diff --git a/nixos/tests/installed-tests/default.nix b/nixos/tests/installed-tests/default.nix
index b2c1b43f90e..2e38cd389c7 100644
--- a/nixos/tests/installed-tests/default.nix
+++ b/nixos/tests/installed-tests/default.nix
@@ -101,7 +101,6 @@ in
   json-glib = callInstalledTest ./json-glib.nix {};
   ibus = callInstalledTest ./ibus.nix {};
   libgdata = callInstalledTest ./libgdata.nix {};
-  librsvg = callInstalledTest ./librsvg.nix {};
   glib-testing = callInstalledTest ./glib-testing.nix {};
   libjcat = callInstalledTest ./libjcat.nix {};
   libxmlb = callInstalledTest ./libxmlb.nix {};
diff --git a/nixos/tests/installed-tests/librsvg.nix b/nixos/tests/installed-tests/librsvg.nix
deleted file mode 100644
index 378e7cce3ff..00000000000
--- a/nixos/tests/installed-tests/librsvg.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ pkgs, makeInstalledTest, ... }:
-
-makeInstalledTest {
-  tested = pkgs.librsvg;
-
-  testConfig = {
-    virtualisation.memorySize = 2047;
-  };
-}
diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix
index 19f75110c13..0d3d5a2a1eb 100644
--- a/pkgs/development/libraries/librsvg/default.nix
+++ b/pkgs/development/libraries/librsvg/default.nix
@@ -22,7 +22,6 @@
 , vala
 , withIntrospection ? stdenv.hostPlatform == stdenv.buildPlatform
 , gobject-introspection
-, nixosTests
 , _experimental-update-script-combinators
 , common-updater-scripts
 , jq
@@ -33,7 +32,7 @@ stdenv.mkDerivation rec {
   pname = "librsvg";
   version = "2.55.0";
 
-  outputs = [ "out" "dev" "installedTests" ] ++ lib.optionals withIntrospection [
+  outputs = [ "out" "dev" ] ++ lib.optionals withIntrospection [
     "devdoc"
   ];
 
@@ -93,16 +92,10 @@ stdenv.mkDerivation rec {
     # https://github.com/NixOS/nixpkgs/pull/117081#issuecomment-827782004
     (lib.enableFeature (withIntrospection && !stdenv.isDarwin) "vala")
 
-    "--enable-installed-tests"
     "--enable-always-build-tests"
   ] ++ lib.optional stdenv.isDarwin "--disable-Bsymbolic"
     ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "RUST_TARGET=${rust.toRustTarget stdenv.hostPlatform}";
 
-  makeFlags = [
-    "installed_test_metadir=${placeholder "installedTests"}/share/installed-tests/RSVG"
-    "installed_testdir=${placeholder "installedTests"}/libexec/installed-tests/RSVG"
-  ];
-
   doCheck = false; # all tests fail on libtool-generated rsvg-convert not being able to find coreutils
 
   # It wants to add loaders and update the loaders.cache in gdk-pixbuf
@@ -176,10 +169,6 @@ stdenv.mkDerivation rec {
         updateSource
         updateLockfile
       ];
-
-    tests = {
-      installedTests = nixosTests.installed-tests.librsvg;
-    };
   };
 
   meta = with lib; {