From 2508fa525226f7b4a91fba44b47fade7a69a2c27 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 23 Oct 2020 10:44:42 +0300 Subject: lxqt.compton-conf: Use compatible qt5 versions Slightly related to #101369, a follow up to: https://github.com/NixOS/nixpkgs/commit/4fd58aa4e18c06ead397ad45d68b76d0930c6cbb --- pkgs/desktops/lxqt/default.nix | 2 +- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix index 90e466f7471ec..1292da151acff 100644 --- a/pkgs/desktops/lxqt/default.nix +++ b/pkgs/desktops/lxqt/default.nix @@ -43,7 +43,7 @@ let ### OPTIONAL qterminal = callPackage ./qterminal {}; - compton-conf = pkgs.qt5.callPackage ./compton-conf {}; + compton-conf = qt5.callPackage ./compton-conf {}; obconf-qt = callPackage ./obconf-qt {}; lximage-qt = callPackage ./lximage-qt {}; qps = callPackage ./qps {}; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bd0e43862eef8..22f23571a3b5a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25900,6 +25900,7 @@ in lumina = recurseIntoAttrs (callPackage ../desktops/lumina { }); lxqt = recurseIntoAttrs (import ../desktops/lxqt { + # TODO: Update these to qt515 at some point qt5 = qt514; libsForQt5 = libsForQt514; inherit pkgs; -- cgit 1.4.1