public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dupeguru: Don't override qt5 version. 

Since Python's pyqt5 is using qt5.15, it should use the same version as
well.
This commit is contained in:
Doron Behar 2020-10-08 14:52:22 +03:00 committed by Frederik Rietdijk
parent 36b7e89f19
commit 56d047f0b0
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/misc/dupeguru/default.nix
View File

@ -40,15 +40,15 @@ python3Packages.buildPythonApplication rec {
# Avoid double wrapping Python programs. # Avoid double wrapping Python programs.
dontWrapQtApps = true; dontWrapQtApps = true;
# TODO: A bug in python wrapper
# see https://github.com/NixOS/nixpkgs/pull/75054#discussion_r357656916
preFixup = '' preFixup = ''
# TODO: A bug in python wrapper
# see https://github.com/NixOS/nixpkgs/pull/75054#discussion_r357656916
makeWrapperArgs="''${qtWrapperArgs[@]}" makeWrapperArgs="''${qtWrapperArgs[@]}"
''; '';
# Executable in $out/bin is a symlink to $out/share/dupeguru/run.py
# so wrapPythonPrograms hook does not handle it automatically.
postFixup = '' 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" wrapPythonProgramsIn "$out/share/dupeguru" "$out $pythonPath"
''; '';

2
pkgs/top-level/all-packages.nix
View File

@ -278,7 +278,7 @@ in
dispad = callPackage ../tools/X11/dispad { }; dispad = callPackage ../tools/X11/dispad { };
dupeguru = callPackage ../applications/misc/dupeguru { qt5 = qt514; }; dupeguru = callPackage ../applications/misc/dupeguru { };
dump1090 = callPackage ../applications/radio/dump1090 { }; dump1090 = callPackage ../applications/radio/dump1090 { };