nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-04-16 02:58:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #317748 from romildo/upd.virt-manager-qt

Browse Source 
lxqt.qtermwidget: add prior version 1.4.0 for compatibility with qt5; virt-manager-qt: 0.72.97 -> 0.72.99
This commit is contained in:
José Romildo Malaquias 2024-06-06 17:10:07 -03:00 committed by GitHub
commit ae55155c14
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/applications/virtualization/virt-manager/qt.nix
View File

@ -1,4 +1,4 @@
{ mkDerivation, lib, fetchFromGitHub, fetchpatch, cmake, pkg-config
{ mkDerivation, lib, fetchFromGitHub, cmake, pkg-config
, qtbase, qtmultimedia, qtsvg, qttools, krdc
, libvncserver, libvirt, pcre, pixman, qtermwidget, spice-gtk, spice-protocol
, libselinux, libsepol, util-linux
@ -6,13 +6,13 @@
mkDerivation rec {
pname = "virt-manager-qt";
version = "0.72.97";
version = "0.72.99";
src = fetchFromGitHub {
owner = "F1ash";
repo = "qt-virt-manager";
rev = version;
sha256 = "0b2bx7ah35glcsiv186sc9cqdrkhg1vs9jz036k9byk61np0cb1i";
hash = "sha256-1aXlGlK+YPOe2X51xycWvSu8YC9uCywyL6ItiScFA04=";
};
cmakeFlags = [
@ -20,14 +20,6 @@ mkDerivation rec {
"-DQTERMWIDGET_INCLUDE_DIRS=${qtermwidget}/include/qtermwidget5"
];
patches = [
(fetchpatch {
# drop with next update
url = "https://github.com/F1ash/qt-virt-manager/commit/0d338b037ef58c376d468c1cd4521a34ea181edd.patch";
sha256 = "1wjqyc5wsnxfwwjzgqjr9hcqhd867amwhjd712qyvpvz8x7p2s24";
})
];
buildInputs = [
qtbase qtmultimedia qtsvg krdc
libvirt libvncserver pcre pixman qtermwidget spice-gtk spice-protocol

5
pkgs/desktops/lxqt/default.nix
View File

@ -75,6 +75,11 @@ let
libfm-qt = libfm-qt_1_4;
inherit (pkgs.libsForQt5) qtbase qtsvg qttools libdbusmenu;
};
qtermwidget_1_4 = callPackage ./qtermwidget {
version = "1.4.0";
lxqt-build-tools = lxqt-build-tools_0_13;
inherit (pkgs.libsForQt5) qtbase qttools;
};
preRequisitePackages = [
kdePackages.kwindowsystem # provides some QT plugins needed by lxqt-panel

8
pkgs/desktops/lxqt/qtermwidget/default.nix
View File

@ -7,17 +7,21 @@
, lxqt-build-tools
, wrapQtAppsHook
, gitUpdater
, version ? "2.0.0"
}:
stdenv.mkDerivation rec {
pname = "qtermwidget";
version = "2.0.0";
inherit version;
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
hash = "sha256-kZS6D/wSJFRt/+Afq0zCCmNnJPpFT+1hd4zVPc+rJsE=";
hash = {
"1.4.0" = "sha256-wYUOqAiBjnupX1ITbFMw7sAk42V37yDz9SrjVhE4FgU=";
"2.0.0" = "sha256-kZS6D/wSJFRt/+Afq0zCCmNnJPpFT+1hd4zVPc+rJsE=";
}."${version}";
};
nativeBuildInputs = [

2
pkgs/top-level/all-packages.nix
View File

@ -35172,7 +35172,7 @@ with pkgs;
};
virt-manager-qt = libsForQt5.callPackage ../applications/virtualization/virt-manager/qt.nix {
qtermwidget = lxqt.qtermwidget;
qtermwidget = lxqt.qtermwidget_1_4;
};
virtscreen = callPackage ../tools/admin/virtscreen { };