aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarel Kočí <cynerd@email.cz>2022-11-23 14:46:51 +0100
committerKarel Kočí <cynerd@email.cz>2022-11-23 14:46:51 +0100
commit50b97c08cbe37d1fe96f1c05bcfb180ea0eb2119 (patch)
treef23f6c458fab44233eb12622e5bca0947bbab2a5
parente991b1bb26b8dafe32e525db69d492eb5947433e (diff)
downloadnixos-personal-50b97c08cbe37d1fe96f1c05bcfb180ea0eb2119.tar.gz
nixos-personal-50b97c08cbe37d1fe96f1c05bcfb180ea0eb2119.tar.bz2
nixos-personal-50b97c08cbe37d1fe96f1c05bcfb180ea0eb2119.zip
pkgs/shvspy: rename qcoro to use standard qcoro and explicitly fork
-rw-r--r--pkgs/default.nix4
-rw-r--r--pkgs/shvspy/default.nix4
2 files changed, 4 insertions, 4 deletions
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 = [