gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lomiri.qtmir: 0.7.2-unstable-2024-01-08 -> 0.8.0-unstable-2024-03-06, switch to debian-upstream branch

Browse Source
This commit is contained in:
OPNA2608
2024-06-12 14:53:24 +02:00
parent e593139ef9
commit 2de3fb4580
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/desktops/lomiri/development/qtmir/default.nix
+8 -8
View File
@@ -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;