diff options
| author | OPNA2608 <opna2608@protonmail.com> | 2024-06-12 14:53:24 +0200 |
|---|---|---|
| committer | OPNA2608 <opna2608@protonmail.com> | 2024-06-12 14:53:24 +0200 |
| commit | 2de3fb4580091e6c28e211ff811123b6c2616f3b (patch) | |
| tree | 3dc3a967b824a929d7505303f6089eb1a4ca2d5f /pkgs/desktops | |
| parent | e593139ef96e2e88b21939b7d6840c3f002ba9ad (diff) | |
lomiri.qtmir: 0.7.2-unstable-2024-01-08 -> 0.8.0-unstable-2024-03-06, switch to debian-upstream branch
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/lomiri/development/qtmir/default.nix | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/desktops/lomiri/development/qtmir/default.nix b/pkgs/desktops/lomiri/development/qtmir/default.nix index 654fd93fc59b2..e22af68476992 100644 --- a/pkgs/desktops/lomiri/development/qtmir/default.nix +++ b/pkgs/desktops/lomiri/development/qtmir/default.nix @@ -34,15 +34,15 @@ stdenv.mkDerivation (finalAttrs: { # Not regular qtmir, experimental support for Mir 2.x - # Currently following https://gitlab.com/ubports/development/core/qtmir/-/tree/personal/mariogrip/desktop-development - pname = "qtmir-mir2"; - version = "0.7.2-unstable-2024-01-08"; + # Currently following https://gitlab.com/ubports/development/core/qtmir/-/tree/personal/sunweaver/debian-upstream + pname = "qtmir-debian-upstream"; + version = "0.8.0-unstable-2024-03-06"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/qtmir"; - rev = "ae0d87415d5c9ed2c4fd2284ba0807d23d564bb0"; - hash = "sha256-fE8ttCC0FNavs91pASGGG7k7nKVg2lD3JK0WTmCA3gM="; + rev = "de639c3a482ac6c59b9be02abb839a8c96158041"; + hash = "sha256-AKSzkGl6bAoR4I2lolNRUp67VS/PiZnrPpCYtTlKWKc="; }; outputs = [ @@ -83,11 +83,11 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' substituteInPlace CMakeLists.txt \ - --replace "\''${CMAKE_INSTALL_FULL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}" \ - --replace "\''${CMAKE_INSTALL_FULL_LIBDIR}/qt5/plugins/platforms" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtPluginPrefix}/platforms" \ + --replace-fail "\''${CMAKE_INSTALL_FULL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}" \ + --replace-fail "\''${CMAKE_INSTALL_FULL_LIBDIR}/qt5/plugins/platforms" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtPluginPrefix}/platforms" \ substituteInPlace data/xwayland.qtmir.desktop \ - --replace '/usr/bin/Xwayland' 'Xwayland' + --replace-fail '/usr/bin/Xwayland' 'Xwayland' ''; strictDeps = true; |