From 8406e0bcd18e24e6db6ddc409ff1dd735d18e809 Mon Sep 17 00:00:00 2001 From: Jörg Thalheim Date: Wed, 25 Nov 2020 15:21:35 +0100 Subject: yubioath-desktop: fix python git dependency (#104884) fixes https://github.com/NixOS/nixpkgs/issues/104826 --- ...01-replace-git-with-normal-python-package.patch | 24 ++++++++++++++++++++++ .../applications/misc/yubioath-desktop/default.nix | 4 ++++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/applications/misc/yubioath-desktop/0001-replace-git-with-normal-python-package.patch diff --git a/pkgs/applications/misc/yubioath-desktop/0001-replace-git-with-normal-python-package.patch b/pkgs/applications/misc/yubioath-desktop/0001-replace-git-with-normal-python-package.patch new file mode 100644 index 0000000000000..d56a6cfab0738 --- /dev/null +++ b/pkgs/applications/misc/yubioath-desktop/0001-replace-git-with-normal-python-package.patch @@ -0,0 +1,24 @@ +From 5eb4d6a384753896d495b09d8651c48672ef234d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= +Date: Wed, 25 Nov 2020 11:26:49 +0100 +Subject: [PATCH] replace git with normal python package +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Jörg Thalheim +--- + requirements.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/requirements.txt b/requirements.txt +index ef25aad..b4246a4 100644 +--- a/requirements.txt ++++ b/requirements.txt +@@ -1,2 +1,2 @@ +-git+https://github.com/Yubico/yubikey-manager.git ++yubikey-manager + ./py/qr +-- +2.29.2 + diff --git a/pkgs/applications/misc/yubioath-desktop/default.nix b/pkgs/applications/misc/yubioath-desktop/default.nix index c6a1022288f78..460b34416ff5b 100644 --- a/pkgs/applications/misc/yubioath-desktop/default.nix +++ b/pkgs/applications/misc/yubioath-desktop/default.nix @@ -19,6 +19,10 @@ mkDerivation rec { nativeBuildInputs = [ qmake makeWrapper python3.pkgs.wrapPython ]; + patches = [ + ./0001-replace-git-with-normal-python-package.patch + ]; + postPatch = '' substituteInPlace deployment.pri \ --replace '/usr/bin' "$out/bin" -- cgit 1.4.1