From 3ccef37d04c5f3d88796a63998cf38d8be2e5e62 Mon Sep 17 00:00:00 2001 From: Claudio Bley Date: Tue, 29 Sep 2020 10:23:28 +0200 Subject: [PATCH] dupeguru: Fix build and unmark as broken Note: the patch should be removed when the next version is released. Co-authored-by: Jon --- pkgs/applications/misc/dupeguru/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/dupeguru/default.nix b/pkgs/applications/misc/dupeguru/default.nix index 3347567b88b..41bfdb3fc5d 100644 --- a/pkgs/applications/misc/dupeguru/default.nix +++ b/pkgs/applications/misc/dupeguru/default.nix @@ -1,4 +1,4 @@ -{stdenv, python3Packages, gettext, qt5, fetchFromGitHub}: +{stdenv, python3Packages, fetchpatch, gettext, qt5, fetchFromGitHub}: python3Packages.buildPythonApplication rec { pname = "dupeguru"; @@ -14,6 +14,15 @@ python3Packages.buildPythonApplication rec { fetchSubmodules = true; }; + patches = [ + # already merged to master, remove next version bump + (fetchpatch { + name = "remove-m-from-so-var.patch"; + url = "https://github.com/arsenetar/dupeguru/commit/bd0f53bcbe463c48fe141b73af13542da36d82ba.patch"; + sha256 = "07iisz8kcr7v8lb21inzj1avlpfhh9k8wcivbd33w49cr3mmnr26"; + }) + ]; + nativeBuildInputs = [ gettext python3Packages.pyqt5 @@ -58,6 +67,5 @@ python3Packages.buildPythonApplication rec { license = licenses.bsd3; platforms = platforms.linux; maintainers = [ maintainers.novoxudonoser ]; - broken = true; # mv: cannot stat '_block.cpython-38m*.so': No such file or directory }; }