From 56d047f0b0a618e134d4a5d78268fa6e7aaf695d Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 8 Oct 2020 14:52:22 +0300 Subject: [PATCH] dupeguru: Don't override qt5 version. Since Python's pyqt5 is using qt5.15, it should use the same version as well. --- pkgs/applications/misc/dupeguru/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/dupeguru/default.nix b/pkgs/applications/misc/dupeguru/default.nix index 0e7155f374d1..6bcc377d0f34 100644 --- a/pkgs/applications/misc/dupeguru/default.nix +++ b/pkgs/applications/misc/dupeguru/default.nix @@ -40,15 +40,15 @@ python3Packages.buildPythonApplication rec { # Avoid double wrapping Python programs. dontWrapQtApps = true; + # TODO: A bug in python wrapper + # see https://github.com/NixOS/nixpkgs/pull/75054#discussion_r357656916 preFixup = '' - # TODO: A bug in python wrapper - # see https://github.com/NixOS/nixpkgs/pull/75054#discussion_r357656916 makeWrapperArgs="''${qtWrapperArgs[@]}" ''; + # Executable in $out/bin is a symlink to $out/share/dupeguru/run.py + # so wrapPythonPrograms hook does not handle it automatically. postFixup = '' - # Executable in $out/bin is a symlink to $out/share/dupeguru/run.py - # so wrapPythonPrograms hook does not handle it automatically. wrapPythonProgramsIn "$out/share/dupeguru" "$out $pythonPath" ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f4ec6ed8dc4e..54ee56c7b1d6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -278,7 +278,7 @@ in dispad = callPackage ../tools/X11/dispad { }; - dupeguru = callPackage ../applications/misc/dupeguru { qt5 = qt514; }; + dupeguru = callPackage ../applications/misc/dupeguru { }; dump1090 = callPackage ../applications/radio/dump1090 { };