diff options
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/desktops/lomiri/development/qtmir/default.nix | 85 |
1 files changed, 42 insertions, 43 deletions
diff --git a/pkgs/desktops/lomiri/development/qtmir/default.nix b/pkgs/desktops/lomiri/development/qtmir/default.nix index 654fd93fc59b2..88ac0b69de9c3 100644 --- a/pkgs/desktops/lomiri/development/qtmir/default.nix +++ b/pkgs/desktops/lomiri/development/qtmir/default.nix @@ -1,48 +1,49 @@ -{ stdenv -, lib -, fetchFromGitLab -, fetchpatch -, testers -, cmake -, cmake-extras -, pkg-config -, wrapQtAppsHook -, gsettings-qt -, gtest -, libqtdbustest -, libqtdbusmock -, libuuid -, lomiri-api -, lomiri-app-launch -, lomiri-url-dispatcher -, lttng-ust -, mir_2_15 -, process-cpp -, qtbase -, qtdeclarative -, qtsensors -, valgrind -, protobuf -, glm -, boost -, properties-cpp -, glib -, validatePkgConfig -, wayland -, xwayland +{ + stdenv, + lib, + fetchFromGitLab, + fetchpatch, + testers, + cmake, + cmake-extras, + pkg-config, + wrapQtAppsHook, + gsettings-qt, + gtest, + libqtdbustest, + libqtdbusmock, + libuuid, + lomiri-api, + lomiri-app-launch, + lomiri-url-dispatcher, + lttng-ust, + mir_2_15, + process-cpp, + qtbase, + qtdeclarative, + qtsensors, + valgrind, + protobuf, + glm, + boost, + properties-cpp, + glib, + validatePkgConfig, + wayland, + xwayland, }: 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 +84,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; @@ -153,8 +154,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.lgpl3Only; maintainers = teams.lomiri.members; platforms = platforms.linux; - pkgConfigModules = [ - "qtmirserver" - ]; + pkgConfigModules = [ "qtmirserver" ]; }; }) |