From caf200a968b3c4bdb74c08e2d18db7beff4e7589 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 9 Aug 2019 14:37:35 +0200 Subject: [PATCH] picard: explicitly wrap the program with 'wrapQtApp' Fixes https://github.com/NixOS/nixpkgs/issues/65776. --- pkgs/applications/audio/picard/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index 1ecb8be09ddf..04a62b5d159c 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages, fetchFromGitHub, gettext, chromaprint }: +{ stdenv, python3Packages, fetchFromGitHub, gettext, chromaprint, qt5 }: let pythonPackages = python3Packages; @@ -13,7 +13,7 @@ in pythonPackages.buildPythonApplication rec { sha256 = "1armg8vpvnbpk7rrfk9q7nj5gm56rza00ni9qwdyqpxp1xaz6apj"; }; - nativeBuildInputs = [ gettext ]; + nativeBuildInputs = [ gettext qt5.wrapQtAppsHook qt5.qtbase ]; propagatedBuildInputs = with pythonPackages; [ pyqt5 @@ -22,15 +22,16 @@ in pythonPackages.buildPythonApplication rec { discid ]; - installPhase = '' - python setup.py install --prefix="$out" - ''; - prePatch = '' # Pesky unicode punctuation. substituteInPlace setup.cfg --replace "‘" "'" ''; + installPhase = '' + python setup.py install --prefix="$out" + wrapQtApp $out/bin/picard + ''; + meta = with stdenv.lib; { homepage = http://musicbrainz.org/doc/MusicBrainz_Picard; description = "The official MusicBrainz tagger";