From 7ce92099d63c8778f2bebd5898d22cc9f0cbeb0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 22 Jun 2021 14:36:25 +0200 Subject: [PATCH] scli: 0.6.1 -> 0.6.3 --- pkgs/applications/misc/scli/default.nix | 26 +++++++++++++++++++------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/scli/default.nix b/pkgs/applications/misc/scli/default.nix index 93fd5d41942b..9694e9b69187 100644 --- a/pkgs/applications/misc/scli/default.nix +++ b/pkgs/applications/misc/scli/default.nix @@ -1,18 +1,28 @@ -{ lib, buildPythonApplication, fetchFromGitHub, signal-cli, urwid -, urwid-readline, dbus }: +{ lib +, python3 +, fetchFromGitHub +, dbus +, signal-cli +, xclip +}: -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "scli"; - version = "0.6.1"; + version = "0.6.3"; src = fetchFromGitHub { owner = "isamert"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hWzpqj/sxPq/doxdmytnj5rh2qKQE71WMB0ugomWhHg"; + sha256 = "sha256-QGVBJKTBo2RckGwW1deM2toRPT73PYDLvr7YVepkQvg="; }; - propagatedBuildInputs = [ signal-cli urwid urwid-readline dbus ]; + propagatedBuildInputs = with python3.pkgs; [ + pyqrcode + urwid + urwid-readline + ]; + dontBuild = true; checkPhase = '' @@ -29,6 +39,10 @@ buildPythonApplication rec { install -m755 -D scli $out/bin/scli ''; + makeWrapperArgs = [ + "--prefix" "PATH" ":" (lib.makeBinPath [ dbus signal-cli xclip ]) + ]; + meta = with lib; { description = "Simple terminal user interface for Signal"; homepage = "https://github.com/isamert/scli"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 45baaaa3099f..74bf0aab5aed 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26567,7 +26567,7 @@ in scite = callPackage ../applications/editors/scite { }; - scli = with python3Packages; callPackage ../applications/misc/scli { }; + scli = callPackage ../applications/misc/scli { }; scribus = callPackage ../applications/office/scribus { inherit (gnome2) libart_lgpl;