From 64388b5b55c15debc89a48987c18d01b8c316df4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 8 Oct 2020 19:00:34 +0200 Subject: [PATCH] cadence: use qt 5.14 consistently --- pkgs/top-level/all-packages.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bcaaff86b9e..4fd776fab41 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19741,7 +19741,17 @@ in bambootracker = libsForQt5.callPackage ../applications/audio/bambootracker { }; - cadence = libsForQt514.callPackage ../applications/audio/cadence { }; + cadence = let + # Use Qt 5.14 consistently + pkgs_ = pkgs.extend(_: prev: { + pythonInterpreters = prev.pythonInterpreters.override(oldAttrs: { + pkgs = oldAttrs.pkgs.extend(_: _: { + qt5 = pkgs.qt514; + libsForQt5 = pkgs.libsForQt514; + }); + }); + }); + in pkgs_.libsForQt514.callPackage ../applications/audio/cadence { }; cheesecutter = callPackage ../applications/audio/cheesecutter { };