diff options
Diffstat (limited to 'nixpkgs/pkgs/desktops/deepin/apps/deepin-voice-note/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/desktops/deepin/apps/deepin-voice-note/default.nix | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/nixpkgs/pkgs/desktops/deepin/apps/deepin-voice-note/default.nix b/nixpkgs/pkgs/desktops/deepin/apps/deepin-voice-note/default.nix index dce0807faa97..13124f82b7aa 100644 --- a/nixpkgs/pkgs/desktops/deepin/apps/deepin-voice-note/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/apps/deepin-voice-note/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , cmake , pkg-config , qttools @@ -10,6 +9,7 @@ , dtkwidget , qt5integration , qt5platform-plugins +, qtsvg , dde-qt-dbus-factory , qtmultimedia , qtwebengine @@ -20,27 +20,17 @@ stdenv.mkDerivation rec { pname = "deepin-voice-note"; - version = "6.0.13"; + version = "6.0.15"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-yDlWyMGkSToGCN7tuZNR8Mz7MUOZ7355w4H0OzeHBrs="; + hash = "sha256-k6LFMs2/OQQyeGI5WXBGWkAAY4GeP8LaA8hTXFwbaCM="; }; patches = [ ./use_v23_dbus_interface.diff - (fetchpatch { - name = "Adjust-the-audio-port-available-range.patch"; - url = "https://github.com/linuxdeepin/deepin-voice-note/commit/a876e4c4cf7d77e50071246f9fb6998aa62def77.patch"; - hash = "sha256-J/PPdj1Am/v2Sw2Dv2XvZJAy/6Tf7OoTfrbOB9rc5m8="; - }) - (fetchpatch { - name = "fix-build-error-with-new-dtk.patch"; - url = "https://github.com/linuxdeepin/deepin-voice-note/commit/9ce211f603deaff21b881e1c4f43d53e33a85347.patch"; - hash = "sha256-oP+AzMniONxjYIFust8fGaD8/UOjKr4yZiRUkdTMd5w="; - }) ]; postPatch = '' @@ -59,8 +49,8 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase + qtsvg dtkwidget - qt5integration qt5platform-plugins dde-qt-dbus-factory qtmultimedia @@ -77,6 +67,11 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DVERSION=${version}" ]; + # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH + qtWrapperArgs = [ + "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" + ]; + preFixup = '' qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") ''; |