lomiri.lomiri-system-settings-unwrapped: 1.3.0 -> 1.3.2 (#407354)

authored by Cosima Neidahl and committed by GitHub 3d58d5ce 90b22d2b

+7 -15
+7 -15
pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix
··· 2 2 stdenv, 3 3 lib, 4 4 fetchFromGitLab, 5 - fetchpatch, 6 5 gitUpdater, 7 6 testers, 8 7 accountsservice, ··· 49 48 50 49 stdenv.mkDerivation (finalAttrs: { 51 50 pname = "lomiri-system-settings-unwrapped"; 52 - version = "1.3.0"; 51 + version = "1.3.2"; 53 52 54 53 src = fetchFromGitLab { 55 54 owner = "ubports"; 56 55 repo = "development/core/lomiri-system-settings"; 57 - rev = finalAttrs.version; 58 - hash = "sha256-8X5a2zJ0y8bSSnbqDvRoYm/2VPAWcfZZuiH+5p8eXi4="; 56 + tag = finalAttrs.version; 57 + hash = "sha256-bVBxJgOy1eXqwzcgBRUTlFoJxxw9I1Qc+Wn92U0QzA4="; 59 58 }; 60 59 61 60 outputs = [ ··· 64 63 ]; 65 64 66 65 patches = [ 67 - # Fixes compat with newer ICU 68 - # Remove when version > 1.3.0 69 - (fetchpatch { 70 - name = "0001-lomiri-system-settings-unwrapped-Unpin-Cxx-standard.patch"; 71 - url = "https://gitlab.com/ubports/development/core/lomiri-system-settings/-/commit/c0b1c773237b28ea50850810b8844033b13fb666.patch"; 72 - hash = "sha256-M73gQxstKyuzzx1VxdOiNYyfQbSZPIy2gxiCtKcdS1M="; 73 - }) 74 - 75 66 ./2000-Support-wrapping-for-Nixpkgs.patch 76 67 ]; 77 68 ··· 80 71 --replace-fail "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}" \ 81 72 82 73 # Port from lomiri-keyboard to maliit-keyboard 83 - substituteInPlace plugins/language/CMakeLists.txt \ 84 - --replace-fail 'LOMIRI_KEYBOARD_PLUGIN_PATH=\"''${CMAKE_INSTALL_FULL_LIBDIR}/lomiri-keyboard/plugins\"' 'LOMIRI_KEYBOARD_PLUGIN_PATH=\"${lib.getLib maliit-keyboard}/lib/maliit/keyboard2/languages\"' 85 74 substituteInPlace plugins/language/{PageComponent,SpellChecking,ThemeValues}.qml plugins/language/onscreenkeyboard-plugin.cpp plugins/sound/PageComponent.qml \ 86 75 --replace-fail 'com.lomiri.keyboard.maliit' 'org.maliit.keyboard.maliit' 87 76 ··· 164 153 cmakeFlags = [ 165 154 (lib.cmakeBool "ENABLE_LIBDEVICEINFO" true) 166 155 (lib.cmakeBool "ENABLE_TESTS" finalAttrs.finalPackage.doCheck) 156 + (lib.cmakeFeature "LOMIRI_KEYBOARD_PLUGIN_PATH" "${lib.getLib maliit-keyboard}/lib/maliit/keyboard2/languages") 167 157 ]; 168 158 169 159 # The linking for this normally ignores missing symbols, which is inconvenient for figuring out why subpages may be ··· 207 197 meta = with lib; { 208 198 description = "System Settings application for Lomiri"; 209 199 homepage = "https://gitlab.com/ubports/development/core/lomiri-system-settings"; 210 - changelog = "https://gitlab.com/ubports/development/core/lomiri-system-settings/-/blob/${finalAttrs.version}/ChangeLog"; 200 + changelog = "https://gitlab.com/ubports/development/core/lomiri-system-settings/-/blob/${ 201 + if (!builtins.isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev 202 + }/ChangeLog"; 211 203 license = licenses.gpl3Only; 212 204 mainProgram = "lomiri-system-settings"; 213 205 teams = [ teams.lomiri ];