mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-19 20:21:14 +00:00
Code Issues Wiki Activity

patchance: Fix issues with qt not being patched (see #236762)

Browse source 
Fixes #228223

Co-authored-by: Tobias Bora <tobias.bora.list@gmail.com>
This commit is contained in:
PowerUser64 2023-06-08 17:55:47 -07:00 committed by Artturin
parent 074dea1e11
commit 4fa859c5f1
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkgs/applications/audio/patchance/default.nix
View file

@ -1,4 +1,4 @@
{ lib, fetchurl, buildPythonApplication, libjack2, pyqt5, qttools, which }:
{ lib, fetchurl, buildPythonApplication, libjack2, pyqt5, qt5, which, bash }:
buildPythonApplication rec {
pname = "patchance";
@ -13,10 +13,11 @@ buildPythonApplication rec {
nativeBuildInputs = [
pyqt5 # pyuic5 and pyrcc5 to build resources.
qttools # lrelease to build translations.
qt5.qttools # lrelease to build translations.
which # which to find lrelease.
qt5.wrapQtAppsHook
];
buildInputs = [ libjack2 ];
buildInputs = [ libjack2 bash ];
propagatedBuildInputs = [ pyqt5 ];
dontWrapQtApps = true; # The program is a python script.
@ -27,8 +28,15 @@ buildPythonApplication rec {
"--prefix" "LD_LIBRARY_PATH" ":" (lib.makeLibraryPath [ libjack2 ])
];
preFixup = ''
makeWrapperArgs+=("''${qtWrapperArgs[@]}")
'';
postFixup = ''
wrapPythonProgramsIn "$out/share/patchance/src" "$out $pythonPath"
for file in $out/bin/*; do
wrapQtApp "$file"
done
'';
meta = with lib; {

4
pkgs/top-level/all-packages.nix
View file

@ -11817,9 +11817,7 @@ with pkgs;
patchage = callPackage ../applications/audio/patchage { };
patchance = python3Packages.callPackage ../applications/audio/patchance {
inherit (qt5) qttools;
};
patchance = python3Packages.callPackage ../applications/audio/patchance { };
patatt = callPackage ../development/tools/patatt { };