From 62738d495cb7b6445e9959b56a9638b8dbdcdac2 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 8 Oct 2020 15:23:06 +0300 Subject: [PATCH] friture: Use qt5.15 just like pyqt5 Don't double wrap executables. --- pkgs/applications/audio/friture/default.nix | 5 ++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/friture/default.nix b/pkgs/applications/audio/friture/default.nix index b93ad14f55ee..e4bd79a08e31 100644 --- a/pkgs/applications/audio/friture/default.nix +++ b/pkgs/applications/audio/friture/default.nix @@ -32,9 +32,8 @@ in py.buildPythonApplication rec { ./unlock_constraints.patch ]; - postFixup = '' - wrapQtApp $out/bin/friture - wrapQtApp $out/bin/.friture-wrapped + preFixup = '' + makeWrapperArgs+=("''${qtWrapperArgs[@]}") ''; meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 082ac23f2150..4dd76312e44c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20836,7 +20836,7 @@ in freerdpUnstable = freerdp; - friture = libsForQt514.callPackage ../applications/audio/friture { }; + friture = libsForQt5.callPackage ../applications/audio/friture { }; fte = callPackage ../applications/editors/fte { };