diff options
-rw-r--r-- | pkgs/applications/virtualization/virt-manager/qt.nix | 3 | ||||
-rw-r--r-- | pkgs/desktops/lxqt/core/qtermwidget/0.7.1.nix | 26 | ||||
-rw-r--r-- | pkgs/desktops/lxqt/default.nix | 2 |
3 files changed, 30 insertions, 1 deletions
diff --git a/pkgs/applications/virtualization/virt-manager/qt.nix b/pkgs/applications/virtualization/virt-manager/qt.nix index fe885d86456b6..2e0503f5a37da 100644 --- a/pkgs/applications/virtualization/virt-manager/qt.nix +++ b/pkgs/applications/virtualization/virt-manager/qt.nix @@ -19,7 +19,8 @@ mkDerivation rec { ]; buildInputs = [ - qtbase qtmultimedia qtsvg lxqt.qtermwidget + # virt-manager-qt currently does not compile with qtermwidget-0.8.0 + qtbase qtmultimedia qtsvg lxqt.qtermwidget_0_7_1 libvirt libvncserver pixman spice_gtk spice_protocol ]; diff --git a/pkgs/desktops/lxqt/core/qtermwidget/0.7.1.nix b/pkgs/desktops/lxqt/core/qtermwidget/0.7.1.nix new file mode 100644 index 0000000000000..6bd6e2833f5ea --- /dev/null +++ b/pkgs/desktops/lxqt/core/qtermwidget/0.7.1.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, cmake, qt5 }: + +stdenv.mkDerivation rec { + name = "${pname}_0_7_1-${version}"; + pname = "qtermwidget"; + version = "0.7.1"; + + srcs = fetchFromGitHub { + owner = "lxde"; + repo = pname; + rev = version; + sha256 = "0awp33cnkpi9brpx01mz5hwj7j2lq1wdi8cabk3wassd99vvxdxz"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ qt5.qtbase ]; + + meta = with stdenv.lib; { + description = "A terminal emulator widget for Qt 5"; + homepage = https://github.com/lxde/qtermwidget; + license = licenses.gpl2; + platforms = with platforms; unix; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix index 16e864890f1e5..79896c7b90cce 100644 --- a/pkgs/desktops/lxqt/default.nix +++ b/pkgs/desktops/lxqt/default.nix @@ -29,6 +29,8 @@ let lxqt-themes = callPackage ./core/lxqt-themes { }; pavucontrol-qt = callPackage ./core/pavucontrol-qt { }; qtermwidget = callPackage ./core/qtermwidget { }; + # for now keep version 0.7.1 because virt-manager-qt currently does not compile with qtermwidget-0.8.0 + qtermwidget_0_7_1 = callPackage ./core/qtermwidget/0.7.1.nix { }; ### CORE 2 lxqt-panel = callPackage ./core/lxqt-panel { }; |