diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2019-08-18 17:58:06 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-18 17:58:06 -0400 |
| commit | 27dbf754e38f40d4c4bd11b591446b9a309d36b7 (patch) | |
| tree | c8025861d857bad3f875aac778aea77a8cdb395f /pkgs/applications/video | |
| parent | 91e9d5229646c3e4816e98903802906fe6ff772f (diff) | |
| parent | b43c368bda0d50a1900f6b305e84ebd139364e7c (diff) | |
| download | nixlib-27dbf754e38f40d4c4bd11b591446b9a309d36b7.tar nixlib-27dbf754e38f40d4c4bd11b591446b9a309d36b7.tar.gz nixlib-27dbf754e38f40d4c4bd11b591446b9a309d36b7.tar.bz2 nixlib-27dbf754e38f40d4c4bd11b591446b9a309d36b7.tar.lz nixlib-27dbf754e38f40d4c4bd11b591446b9a309d36b7.tar.xz nixlib-27dbf754e38f40d4c4bd11b591446b9a309d36b7.tar.zst nixlib-27dbf754e38f40d4c4bd11b591446b9a309d36b7.zip | |
Merge pull request #66684 from vbgl/mkvtoolnix-qt-mkDerivation
mkvtoolnix: use wrapQtApp
Diffstat (limited to 'pkgs/applications/video')
| -rw-r--r-- | pkgs/applications/video/mkvtoolnix/default.nix | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index c13bf3480d25..7c4d6d339f3e 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -4,9 +4,10 @@ , withGUI ? true , qtbase ? null , qtmultimedia ? null + , wrapQtAppsHook ? null }: -assert withGUI -> qtbase != null && qtmultimedia != null; +assert withGUI -> qtbase != null && qtmultimedia != null && wrapQtAppsHook != null; with stdenv.lib; @@ -30,7 +31,7 @@ stdenv.mkDerivation rec { expat file xdg_utils boost libebml zlib fmt libmatroska libogg libvorbis flac cmark ] ++ optional stdenv.isDarwin libiconv - ++ optionals withGUI [ qtbase qtmultimedia ]; + ++ optionals withGUI [ qtbase qtmultimedia wrapQtAppsHook ]; preConfigure = "./autogen.sh; patchShebangs ."; buildPhase = "drake -j $NIX_BUILD_CORES"; @@ -49,6 +50,11 @@ stdenv.mkDerivation rec { (enableFeature withGUI "qt") ]; + dontWrapQtApps = true; + postFixup = optionalString withGUI '' + wrapQtApp $out/bin/mkvtoolnix-gui + ''; + meta = with stdenv.lib; { description = "Cross-platform tools for Matroska"; homepage = http://www.bunkus.org/videotools/mkvtoolnix/; |