lomiri.lomiri-system-settings-security-privacy: Drop

Has been merged into LSS, wrapper infra stays around for when further plugins get packaged.

Added an alias for lomiri-system-settings-security-privacy -> lomiri-system-settings-unwrapped.

pkgs/desktops/lomiri/applications/lomiri-system-settings/plugins/lomiri-system-settings-security-privacy.nix

@@ -1,94 +0,0 @@
-{ stdenv
-, lib
-, fetchFromGitLab
-, biometryd
-, cmake
-, libqtdbusmock
-, libqtdbustest
-, lomiri-system-settings-unwrapped
-, pkg-config
-, polkit
-, python3
-, qtbase
-, qtdeclarative
-, trust-store
-, xvfb-run
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "lomiri-system-settings-security-privacy";
-  version = "1.0.2";
-
-  src = fetchFromGitLab {
-    owner = "ubports";
-    repo = "development/core/lomiri-system-settings-security-privacy";
-    rev = finalAttrs.version;
-    hash = "sha256-d7OgxV362gJ3t5N+DEFgwyK+m6Ij6juRPuxfmbCg68Y=";
-  };
-
-  postPatch = ''
-    # CMake pkg_get_variable cannot replace prefix variable yet
-    for pcvar in plugin_manifest_dir plugin_private_module_dir plugin_qml_dir; do
-      pcvarname=$(echo $pcvar | tr '[:lower:]' '[:upper:]')
-      substituteInPlace CMakeLists.txt \
-        --replace-fail "pkg_get_variable($pcvarname LomiriSystemSettings $pcvar)" "set($pcvarname $(pkg-config LomiriSystemSettings --define-variable=prefix=$out --define-variable=libdir=$out/lib --variable=$pcvar))"
-    done
-
-    # Compatibility with newer libqofono
-    substituteInPlace plugins/security-privacy/{Ofono,PageComponent,SimPin}.qml \
-      --replace-fail 'import MeeGo.QOfono' 'import QOfono'
-  '';
-
-  strictDeps = true;
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-    python3
-    qtdeclarative
-  ];
-
-  buildInputs = [
-    lomiri-system-settings-unwrapped
-    polkit
-    qtbase
-    qtdeclarative
-    trust-store
-  ];
-
-  # QML components and schemas the wrapper needs
-  propagatedBuildInputs = [
-    biometryd
-  ];
-
-  nativeCheckInputs = [
-    xvfb-run
-  ];
-
-  checkInputs = [
-    libqtdbusmock
-    libqtdbustest
-  ];
-
-  # Plugin library & modules for LSS
-  dontWrapQtApps = true;
-
-  cmakeFlags = [
-    (lib.cmakeBool "ENABLE_TESTS" finalAttrs.finalPackage.doCheck)
-  ];
-
-  doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
-
-  preCheck = ''
-    export QT_PLUGIN_PATH=${lib.getBin qtbase}/${qtbase.qtPluginPrefix}
-  '';
-
-  meta = with lib; {
-    description = "Security and privacy settings plugin for Lomiri system settings";
-    homepage = "https://gitlab.com/ubports/development/core/lomiri-system-settings-security-privacy";
-    changelog = "https://gitlab.com/ubports/development/core/lomiri-system-settings-security-privacy/-/blob/${finalAttrs.version}/ChangeLog";
-    license = licenses.gpl3Only;
-    maintainers = teams.lomiri.members;
-    platforms = platforms.linux;
-  };
-})

pkgs/desktops/lomiri/applications/lomiri-system-settings/wrapper.nix

@@ -4,10 +4,9 @@
 , glib
 , lndir
 , lomiri-system-settings-unwrapped
-, lomiri-system-settings-security-privacy
 , wrapGAppsHook3
 , wrapQtAppsHook
-, plugins ? [ lomiri-system-settings-security-privacy ]
+, plugins ? [ ]
 }:
 
 stdenvNoCC.mkDerivation (finalAttrs: {

pkgs/desktops/lomiri/default.nix

@@ -1,4 +1,5 @@
-{ lib
+{ config
+, lib
 , pkgs
 , libsForQt5
 }:
@@ -14,7 +15,6 @@ let
     lomiri-clock-app = callPackage ./applications/lomiri-clock-app { };
     lomiri-filemanager-app = callPackage ./applications/lomiri-filemanager-app { };
     lomiri-system-settings-unwrapped = callPackage ./applications/lomiri-system-settings { };
-    lomiri-system-settings-security-privacy = callPackage ./applications/lomiri-system-settings/plugins/lomiri-system-settings-security-privacy.nix { };
     lomiri-system-settings = callPackage ./applications/lomiri-system-settings/wrapper.nix { };
     lomiri-terminal-app = callPackage ./applications/lomiri-terminal-app { };
     morph-browser = callPackage ./applications/morph-browser { };
@@ -62,4 +62,6 @@ let
     telephony-service = callPackage ./services/telephony-service { };
   };
 in
-  lib.makeScope libsForQt5.newScope packages
+  lib.makeScope libsForQt5.newScope packages // lib.optionalAttrs config.allowAliases {
+    lomiri-system-settings-security-privacy = lib.warn "`lomiri-system-settings-security-privacy` upstream was merged into `lomiri-system-settings`. Please use `pkgs.lomiri.lomiri-system-settings-unwrapped` if you need to directly access the plugins that belonged to this project." pkgs.lomiri.lomiri-system-settings-unwrapped; # Added on 2024-08-08
+  }