From c9301a6da1463b33e1dbf83ae0e143923ec52818 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 4 Jun 2026 00:51:46 +0200 Subject: [PATCH] {lomiri,lomiri-qt6}.lomiri-thumbnailer: 3.1.0 -> 3.1.1 --- .../services/lomiri-thumbnailer/default.nix | 28 ++++++++----------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/pkgs/desktops/lomiri/services/lomiri-thumbnailer/default.nix b/pkgs/desktops/lomiri/services/lomiri-thumbnailer/default.nix index 44640f61b509..800bc37d145c 100644 --- a/pkgs/desktops/lomiri/services/lomiri-thumbnailer/default.nix +++ b/pkgs/desktops/lomiri/services/lomiri-thumbnailer/default.nix @@ -37,13 +37,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "lomiri-thumbnailer"; - version = "3.1.0"; + version = "3.1.1"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/lomiri-thumbnailer"; tag = finalAttrs.version; - hash = "sha256-lXvXK7UCLX5aoGID8sOoeHBEMhdle7RUMACLHiWpcEo="; + hash = "sha256-NEFwNofW0Ry9V0oUiUeuzs7q6+Ht2B0oCEGjmc3ywck="; }; outputs = [ @@ -66,27 +66,21 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace plugins/Lomiri/Thumbnailer*/CMakeLists.txt \ --replace-fail "\''${CMAKE_INSTALL_LIBDIR}/qt\''${QT_VERSION_MAJOR}/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 compiler passes to the linker an architecture-specific system library search directory such as - # > /lib/ this variable contains the name if/as detected by CMake. + '' + # 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 compiler passes to the linker an architecture-specific system library search directory such as + # > /lib/ this variable contains the name if/as detected by CMake. + + '' substituteInPlace tests/qml/CMakeLists.txt \ --replace-fail 'CMAKE_LIBRARY_ARCHITECTURE' 'CMAKE_SYSTEM_PROCESSOR' \ --replace-fail 'powerpc-linux-gnu' 'ppc' \ --replace-fail 's390x-linux-gnu' 's390x' - - # Tests run in parallel to other builds, don't suck up cores + '' + # Tests run in parallel to other builds, don't suck up cores + + '' substituteInPlace tests/headers/compile_headers.py \ --replace-fail 'max_workers=multiprocessing.cpu_count()' "max_workers=1" - '' - # https://gitlab.com/ubports/development/core/lomiri-thumbnailer/-/merge_requests/31 - # Too simple to bother with fetchpatch - + '' - substituteInPlace CMakeLists.txt \ - --replace-fail \ - 'find_package(Boost COMPONENTS filesystem iostreams regex system REQUIRED)' \ - 'find_package(Boost COMPONENTS filesystem iostreams regex REQUIRED)' ''; strictDeps = true;