diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-08-22 13:47:37 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-08-22 18:22:22 +0000 |
| commit | 1b9a13c4689af7e088eb7af5589f8c811282846a (patch) | |
| tree | 3ed032953008280fb94ef894c869ff3e2a2f7865 /nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix | |
| parent | 4999a38db7c5de0ea9f514a12ecd4133cce647f3 (diff) | |
| parent | 1412af4b2cfae71d447164097d960d426e9752c0 (diff) | |
| download | nixlib-1b9a13c4689af7e088eb7af5589f8c811282846a.tar nixlib-1b9a13c4689af7e088eb7af5589f8c811282846a.tar.gz nixlib-1b9a13c4689af7e088eb7af5589f8c811282846a.tar.bz2 nixlib-1b9a13c4689af7e088eb7af5589f8c811282846a.tar.lz nixlib-1b9a13c4689af7e088eb7af5589f8c811282846a.tar.xz nixlib-1b9a13c4689af7e088eb7af5589f8c811282846a.tar.zst nixlib-1b9a13c4689af7e088eb7af5589f8c811282846a.zip | |
Merge remote-tracking branch 'channels/nixos-unstable'
Diffstat (limited to 'nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix b/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix index c13bf3480d25..7c4d6d339f3e 100644 --- a/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix +++ b/nixpkgs/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/; |