diff options
Diffstat (limited to 'pkgs/desktops/lomiri')
6 files changed, 343 insertions, 5 deletions
diff --git a/pkgs/desktops/lomiri/data/lomiri-wallpapers/default.nix b/pkgs/desktops/lomiri/data/lomiri-wallpapers/default.nix new file mode 100644 index 000000000000..9cdb7887ee88 --- /dev/null +++ b/pkgs/desktops/lomiri/data/lomiri-wallpapers/default.nix @@ -0,0 +1,48 @@ +{ stdenvNoCC +, lib +, fetchFromGitLab +, gitUpdater +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "lomiri-wallpapers"; + version = "20.04.0"; + + src = fetchFromGitLab { + owner = "ubports"; + repo = "development/core/lomiri-wallpapers"; + rev = finalAttrs.version; + hash = "sha256-n8+vY+MPVqW6s5kSo4aEtGZv1AsjB3nNEywbmcNWfhI="; + }; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share + + # release-specific wallpapers + cp -r ${lib.versions.majorMinor finalAttrs.version} $out/share/wallpapers + rm $out/share/wallpapers/.placeholder + + # eternal hardwired fallback/default + install -Dm644 {.,$out/share/wallpapers}/warty-final-ubuntu.png + ln -s warty-final-ubuntu.png $out/share/wallpapers/lomiri-default-background.png + + runHook postInstall + ''; + + passthru.updateScript = gitUpdater { }; + + meta = with lib; { + description = "Wallpapers for the Lomiri Operating Environment, gathered from people of the Ubuntu Touch / UBports community"; + homepage = "https://gitlab.com/ubports/development/core/lomiri-wallpapers"; + changelog = "https://gitlab.com/ubports/development/core/lomiri-wallpapers/-/blob/${finalAttrs.version}/ChangeLog"; + # On update, recheck debian/copyright for which licenses apply to the installed images + license = with licenses; [ cc-by-sa-30 ]; + maintainers = teams.lomiri.members; + platforms = platforms.all; + }; +}) diff --git a/pkgs/desktops/lomiri/default.nix b/pkgs/desktops/lomiri/default.nix index 8c4d9e730cb1..a96b956d9466 100644 --- a/pkgs/desktops/lomiri/default.nix +++ b/pkgs/desktops/lomiri/default.nix @@ -13,6 +13,7 @@ let #### Data lomiri-schemas = callPackage ./data/lomiri-schemas { }; lomiri-sounds = callPackage ./data/lomiri-sounds { }; + lomiri-wallpapers = callPackage ./data/lomiri-wallpapers { }; suru-icon-theme = callPackage ./data/suru-icon-theme { }; #### Development tools / libraries @@ -32,6 +33,7 @@ let lomiri-settings-components = callPackage ./qml/lomiri-settings-components { }; lomiri-ui-extras = callPackage ./qml/lomiri-ui-extras { }; lomiri-ui-toolkit = callPackage ./qml/lomiri-ui-toolkit { }; + qqc2-suru-style = callPackage ./qml/qqc2-suru-style { }; #### Services biometryd = callPackage ./services/biometryd { }; @@ -40,6 +42,7 @@ let history-service = callPackage ./services/history-service { }; lomiri-download-manager = callPackage ./services/lomiri-download-manager { }; lomiri-indicator-network = callPackage ./services/lomiri-indicator-network { }; + lomiri-thumbnailer = callPackage ./services/lomiri-thumbnailer { }; lomiri-url-dispatcher = callPackage ./services/lomiri-url-dispatcher { }; mediascanner2 = callPackage ./services/mediascanner2 { }; telephony-service = callPackage ./services/telephony-service { }; diff --git a/pkgs/desktops/lomiri/development/trust-store/default.nix b/pkgs/desktops/lomiri/development/trust-store/default.nix index 477cdd0511f8..845e2d0ee59d 100644 --- a/pkgs/desktops/lomiri/development/trust-store/default.nix +++ b/pkgs/desktops/lomiri/development/trust-store/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "trust-store"; - version = "unstable-2023-10-17"; + version = "0-unstable-2023-12-27"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/trust-store"; - rev = "7aa7ab5b7f3843e24c13ae6d9b8607455296d60e"; - hash = "sha256-j+4FZzbG3qh1pGRapFuuMiwT4Lv9P6Ji9/3Z0uGvXmw="; + rev = "c91e5ac54c4032525f930f0651d673ad3a1095a2"; + hash = "sha256-zqs40tKo2AOd9yL2Xfbk52Uh8hy4uT1XDT6YtKufAaY="; }; outputs = [ @@ -86,8 +86,10 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ # Requires mirclient API, unavailable in Mir 2.x # https://gitlab.com/ubports/development/core/trust-store/-/issues/2 - "-DTRUST_STORE_MIR_AGENT_ENABLED=OFF" - "-DTRUST_STORE_ENABLE_DOC_GENERATION=ON" + (lib.cmakeBool "TRUST_STORE_MIR_AGENT_ENABLED" false) + (lib.cmakeBool "TRUST_STORE_ENABLE_DOC_GENERATION" true) + # error: moving a temporary object prevents copy elision + (lib.cmakeBool "ENABLE_WERROR" false) ]; # Not working diff --git a/pkgs/desktops/lomiri/qml/qqc2-suru-style/default.nix b/pkgs/desktops/lomiri/qml/qqc2-suru-style/default.nix new file mode 100644 index 000000000000..5717ae35f113 --- /dev/null +++ b/pkgs/desktops/lomiri/qml/qqc2-suru-style/default.nix @@ -0,0 +1,45 @@ +{ stdenv +, lib +, fetchFromGitLab +, gitUpdater +, qmake +, qtdeclarative +, qtquickcontrols2 +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "qqc2-suru-style"; + version = "0.20230206"; + + src = fetchFromGitLab { + owner = "ubports"; + repo = "development/core/qqc2-suru-style"; + rev = finalAttrs.version; + hash = "sha256-ZLPuXnhlR1IDhGnprcdWHLnOeS6ZzVkFhQML0iKMjO8="; + }; + + # QMake can't find Qt modules from buildInputs + strictDeps = false; + + nativeBuildInputs = [ + qmake + ]; + + buildInputs = [ + qtdeclarative + qtquickcontrols2 + ]; + + dontWrapQtApps = true; + + passthru.updateScript = gitUpdater { }; + + meta = with lib; { + description = "Suru Style for QtQuick Controls 2"; + homepage = "https://gitlab.com/ubports/development/core/qqc2-suru-style"; + changelog = "https://gitlab.com/ubports/development/core/qqc2-suru-style/-/blob/${finalAttrs.version}/ChangeLog"; + license = with licenses; [ gpl2Plus lgpl3Only cc-by-sa-30 ]; + maintainers = teams.lomiri.members; + platforms = platforms.unix; + }; +}) diff --git a/pkgs/desktops/lomiri/services/biometryd/default.nix b/pkgs/desktops/lomiri/services/biometryd/default.nix index c8d0da9a65c2..e0f221313a43 100644 --- a/pkgs/desktops/lomiri/services/biometryd/default.nix +++ b/pkgs/desktops/lomiri/services/biometryd/default.nix @@ -56,6 +56,13 @@ stdenv.mkDerivation (finalAttrs: { url = "https://gitlab.com/OPNA2608/biometryd/-/commit/9e52fad0139c5a45f69e6a6256b2b5ff54f77740.patch"; hash = "sha256-DZSdzKq6EYgAllKSDgkGk2g57zHN+gI5fOoj7U5AcKY="; }) + + # Fix GCC13 & musl compat + # Remove when version > 0.3.0 + (fetchpatch { + url = "https://gitlab.com/ubports/development/core/biometryd/-/commit/bc6f1a743dbb0eda6310bd13229f650be62aa3b3.patch"; + hash = "sha256-Pr3zHrMNxTKYHsqHEcVv4fYVknjUwBFRTSuBxZhqUi8="; + }) ]; postPatch = '' diff --git a/pkgs/desktops/lomiri/services/lomiri-thumbnailer/default.nix b/pkgs/desktops/lomiri/services/lomiri-thumbnailer/default.nix new file mode 100644 index 000000000000..19741c616d72 --- /dev/null +++ b/pkgs/desktops/lomiri/services/lomiri-thumbnailer/default.nix @@ -0,0 +1,233 @@ +{ stdenv +, lib +, fetchFromGitLab +, fetchpatch +, gitUpdater +, testers +, boost +, cmake +, cmake-extras +, doxygen +, gst_all_1 +, gdk-pixbuf +, gtest +, makeFontsConf +, libapparmor +, libexif +, libqtdbustest +, librsvg +, lomiri-api +, persistent-cache-cpp +, pkg-config +, python3 +, qtbase +, qtdeclarative +, shared-mime-info +, taglib +, validatePkgConfig +, wrapGAppsHook +, xvfb-run +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "lomiri-thumbnailer"; + version = "3.0.2"; + + src = fetchFromGitLab { + owner = "ubports"; + repo = "development/core/lomiri-thumbnailer"; + rev = finalAttrs.version; + hash = "sha256-AZoXTE4ix/NDBSwPJcod+cMNnfrCxFj5IzxCWxh6uq0="; + }; + + outputs = [ + "out" + "dev" + "doc" + ]; + + patches = [ + # Remove when version > 3.0.2 + (fetchpatch { + name = "0001-lomiri-thumbnailer-Stop-using-qt5_use_modules.patch"; + url = "https://gitlab.com/ubports/development/core/lomiri-thumbnailer/-/commit/a0d81863f3f48717507cfa181030a8ffb0c4e881.patch"; + hash = "sha256-B0935Hve5zYA3aUqr0RUtJsOAsfDAF/L7/20F4I+5s0="; + }) + + # Remove when https://gitlab.com/ubports/development/core/lomiri-thumbnailer/-/merge_requests/19 merged & in release + (fetchpatch { + name = "0002-lomiri-thumbnailer-Add-more-better-GNUInstallDirs-variables-usage.patch"; + url = "https://gitlab.com/ubports/development/core/lomiri-thumbnailer/-/commit/0b9795a6313fd025d5646f2628a2cbb3104b0ebc.patch"; + hash = "sha256-br99n2nDLjUfnjbjhOsWlvP62VmVjYeZ6yPs1dhPN/s="; + }) + + # Remove when version > 3.0.2 + (fetchpatch { + name = "0003-lomiri-thumbnailer-Fix-check-for-No-such-file-or-directory-error.patch"; + url = "https://gitlab.com/ubports/development/core/lomiri-thumbnailer/-/commit/de8f9175830581e9180ed789b92dffbb08dfe436.patch"; + hash = "sha256-JHoYTATbR8NTsVU2+8+R2sCSU6ZDLyKgmdbt4VZPv3Q="; + }) + + # Remove when version > 3.0.2 + (fetchpatch { + name = "0004-lomiri-thumbnailer-tests-headers-CMakelists.txt-Remove-extra-slash-in-include-paths.patch"; + url = "https://gitlab.com/ubports/development/core/lomiri-thumbnailer/-/commit/3598fdc84ded8241f273c89c95371d4675690e38.patch"; + hash = "sha256-Sonjc/a6hfuXhaus2scfmPfgIYWxsRD/1/IIACLqsBA="; + }) + + # Remove when https://gitlab.com/ubports/development/core/lomiri-thumbnailer/-/merge_requests/22 merged & in release + (fetchpatch { + name = "0005-lomiri-thumbnailer-Make-tests-optional.patch"; + url = "https://gitlab.com/ubports/development/core/lomiri-thumbnailer/-/commit/df7a3d1689f875d207a90067b957e888160491b9.patch"; + hash = "sha256-gVxigpSL/3fXNdJBjh8Ex3/TYmQUiwRji/NmLW/uhE4="; + }) + + # Remove when https://gitlab.com/ubports/development/core/lomiri-thumbnailer/-/merge_requests/23 merged & in release + (fetchpatch { + name = "0006-lomiri-thumbnailer-doc-liblomiri-thumbnailer-qt-Honour-CMAKE_INSTALL_DOCDIR.patch"; + url = "https://gitlab.com/ubports/development/core/lomiri-thumbnailer/-/commit/930a3b57e899f6eb65a96d096edaea6a6f6b242a.patch"; + hash = "sha256-klYycUoQqA+Dfk/4fRQgdS4/G4o0sC1k98mbtl0iHkE="; + }) + (fetchpatch { + name = "0007-lomiri-thumbnailer-Re-enable-documentation.patch"; + url = "https://gitlab.com/ubports/development/core/lomiri-thumbnailer/-/commit/2f9186f71fdd25e8a0852073f1da59ba6169cf3f.patch"; + hash = "sha256-youaJfCeYVpLmruHMupuUdl0c/bSDPWqKPLgu5plBrw="; + }) + (fetchpatch { + name = "0008-lomiri-thumbnailer-doc-liblomiri-thumbnailer-qt-examples-Drop-qt5_use_modules-usage.patch"; + url = "https://gitlab.com/ubports/development/core/lomiri-thumbnailer/-/commit/9e5cf09de626e73e6b8f180cbc1160ebd2f169e7.patch"; + hash = "sha256-vfNCN7tqq6ngzNmb3qqHDHaDx/kI8/UXyyv7LqUWya0="; + }) + (fetchpatch { + name = "0009-lomiri-thumbnailer-Re-enable-coverge-reporting.patch"; + url = "https://gitlab.com/ubports/development/core/lomiri-thumbnailer/-/commit/6a48831f042cd3ad34200f32800393d4eec2f84b.patch"; + hash = "sha256-HZd4K0R1W6adOjKy7tODfQAD+9IKPcK0DnH1uKNd/Ak="; + }) + (fetchpatch { + name = "0010-lomiri-thumbnailer-Make-GTest-available-to-example-test.patch"; + url = "https://gitlab.com/ubports/development/core/lomiri-thumbnailer/-/commit/657be3bd1aeb227edc04e26b597b2fe97b2dc51a.patch"; + hash = "sha256-XEvdWV3JJujG16+87iewYor0jFK7NTeE5459iT96SkU="; + }) + ]; + + postPatch = '' + patchShebangs tools/{parse-settings.py,run-xvfb.sh} tests/{headers,whitespace,server}/*.py + + substituteInPlace tests/thumbnailer-admin/thumbnailer-admin_test.cpp \ + --replace '/usr/bin/test' 'test' + + substituteInPlace plugins/*/Thumbnailer*/CMakeLists.txt \ + --replace "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}" + + # I think this variable fails to be populated because of our toolchain, while upstream uses Debian / Ubuntu where this works fine + # https://cmake.org/cmake/help/v3.26/variable/CMAKE_LIBRARY_ARCHITECTURE.html + # > If the <LANG> compiler passes to the linker an architecture-specific system library search directory such as + # > <prefix>/lib/<arch> this variable contains the <arch> name if/as detected by CMake. + substituteInPlace tests/qml/CMakeLists.txt \ + --replace 'CMAKE_LIBRARY_ARCHITECTURE' 'CMAKE_SYSTEM_PROCESSOR' \ + --replace 'powerpc-linux-gnu' 'ppc' \ + --replace 's390x-linux-gnu' 's390x' + + # Tests run in parallel to other builds, don't suck up cores + substituteInPlace tests/headers/compile_headers.py \ + --replace 'max_workers=multiprocessing.cpu_count()' "max_workers=1" + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + doxygen + gdk-pixbuf # setup hook + pkg-config + (python3.withPackages (ps: with ps; lib.optionals finalAttrs.doCheck [ + python-dbusmock + tornado + ])) + validatePkgConfig + wrapGAppsHook + ]; + + buildInputs = [ + boost + cmake-extras + gdk-pixbuf + libapparmor + libexif + librsvg + lomiri-api + persistent-cache-cpp + qtbase + qtdeclarative + shared-mime-info + taglib + ] ++ (with gst_all_1; [ + gstreamer + gst-plugins-base + gst-plugins-good + gst-plugins-bad + # maybe add ugly to cover all kinds of formats? + ]); + + nativeCheckInputs = [ + shared-mime-info + xvfb-run + ]; + + checkInputs = [ + gtest + libqtdbustest + ]; + + dontWrapQtApps = true; + + cmakeFlags = [ + (lib.cmakeBool "GSETTINGS_LOCALINSTALL" true) + (lib.cmakeBool "GSETTINGS_COMPILE" true) + # error: use of old-style cast to 'std::remove_reference<_GstElement*>::type' {aka 'struct _GstElement*'} + (lib.cmakeBool "Werror" false) + (lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" (lib.concatStringsSep ";" [ + # QSignalSpy tests in QML suite always fail, pass when running interactively + "-E" "^qml" + ])) + ]; + + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + + enableParallelChecking = false; + + preCheck = '' + # Fontconfig warnings breaks some tests + export FONTCONFIG_FILE=${makeFontsConf { fontDirectories = []; }} + export HOME=$TMPDIR + + # Some tests need Qt plugins + export QT_PLUGIN_PATH=${lib.getBin qtbase}/${qtbase.qtPluginPrefix} + + # QML tests need QML modules + export QML2_IMPORT_PATH=${lib.getBin qtdeclarative}/${qtbase.qtQmlPrefix} + ''; + + preFixup = '' + gappsWrapperArgs+=( + --prefix XDG_DATA_DIRS : ${lib.makeSearchPath "share" [ shared-mime-info ]} + ) + ''; + + passthru = { + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + updateScript = gitUpdater { }; + }; + + meta = with lib; { + description = "D-Bus service for out of process thumbnailing"; + homepage = "https://gitlab.com/ubports/development/core/lomiri-thumbnailer"; + changelog = "https://gitlab.com/ubports/development/core/lomiri-thumbnailer/-/blob/${finalAttrs.version}/ChangeLog"; + license = with licenses; [ gpl3Only lgpl3Only ]; + maintainers = teams.lomiri.members; + platforms = platforms.linux; + pkgConfigModules = [ + "liblomiri-thumbnailer-qt" + ]; + }; +}) |