From 50b97c08cbe37d1fe96f1c05bcfb180ea0eb2119 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Wed, 23 Nov 2022 14:46:51 +0100 Subject: pkgs/shvspy: rename qcoro to use standard qcoro and explicitly fork --- pkgs/default.nix | 4 ++-- pkgs/shvspy/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs') diff --git a/pkgs/default.nix b/pkgs/default.nix index 80d75ad..579ee1f 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -36,8 +36,8 @@ let # Elektroline packages shvspy = callPackage ./shvspy { }; - qcoro = nixpkgs.libsForQt5.qcoro.overrideAttrs (oldAttrs: { - version = "0.6.1"; + qcoro_task_exception_handling = nixpkgs.libsForQt5.qcoro.overrideAttrs (oldAttrs: { + version = "0.6.0"; src = nixpkgs.fetchFromGitHub { owner = "danvratil"; repo = "qcoro"; diff --git a/pkgs/shvspy/default.nix b/pkgs/shvspy/default.nix index 495a2ec..edc0bd4 100644 --- a/pkgs/shvspy/default.nix +++ b/pkgs/shvspy/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, cmake, doctest, libsForQt5, qcoro +, cmake, doctest, libsForQt5, qcoro_task_exception_handling , makeDesktopItem, copyDesktopItems }: with libsForQt5; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { cmake doctest wrapQtAppsHook copyDesktopItems ]; buildInputs = [ - qtbase qtserialport qtwebsockets doctest qcoro + qtbase qtserialport qtwebsockets doctest qcoro_task_exception_handling ]; desktopItems = [ -- cgit v1.2.3