mkvtoolnix: 87.0 -> 91.0 (#395529)

authored by Michele Guerini Rocco and committed by GitHub 6be65cb8 7767c4b6

+23 -29
+23 -27
pkgs/applications/video/mkvtoolnix/default.nix pkgs/by-name/mk/mkvtoolnix/package.nix
··· 1 { 2 lib, 3 stdenv, 4 - fetchFromGitLab, 5 pkg-config, 6 autoreconfHook, 7 rake, ··· 9 cmark, 10 docbook_xsl, 11 expat, 12 - fetchpatch2, 13 file, 14 flac, 15 fmt, ··· 25 libxslt, 26 nlohmann_json, 27 pugixml, 28 - qtbase, 29 - qtmultimedia, 30 - qtwayland, 31 utf8cpp, 32 xdg-utils, 33 zlib, 34 withGUI ? true, 35 - wrapQtAppsHook, 36 }: 37 38 let ··· 53 ''; 54 55 in 56 - stdenv.mkDerivation rec { 57 pname = "mkvtoolnix"; 58 - version = "87.0"; 59 60 - src = fetchFromGitLab { 61 owner = "mbunkus"; 62 repo = "mkvtoolnix"; 63 - rev = "release-${version}"; 64 - hash = "sha256-UU57ZgH1sxCXspwfKXScw08aJYiv+k526U8q8N1tA+4="; 65 }; 66 67 - patches = [ 68 - (fetchpatch2 { 69 - url = "https://gitlab.com/mbunkus/mkvtoolnix/-/commit/fc83003f541ac690fe308c3f4ac36e62814a40db.diff"; 70 - hash = "sha256-HOS79g5xm70upV5Okv1COEg0SanXs7brRRB59Ofx5HA="; 71 - }) 72 - ]; 73 74 nativeBuildInputs = [ 75 autoreconfHook ··· 79 libxslt 80 pkg-config 81 rake 82 - ] ++ optionals withGUI [ wrapQtAppsHook ]; 83 84 # qtbase and qtmultimedia are needed without the GUI 85 buildInputs = ··· 97 libvorbis 98 nlohmann_json 99 pugixml 100 - qtbase 101 - qtmultimedia 102 utf8cpp 103 xdg-utils 104 zlib 105 ] 106 ++ optionals withGUI [ cmark ] 107 - ++ optionals stdenv.hostPlatform.isLinux [ qtwayland ]; 108 109 # autoupdate is not needed but it silences a ton of pointless warnings 110 postPatch = '' ··· 116 "--disable-debug" 117 "--disable-precompiled-headers" 118 "--disable-profiling" 119 - "--disable-static-qt" 120 "--disable-update-check" 121 "--enable-optimization" 122 "--with-boost-libdir=${getLib boost}/lib" ··· 141 wrapQtApp $out/bin/mkvtoolnix-gui 142 ''; 143 144 - meta = with lib; { 145 description = "Cross-platform tools for Matroska"; 146 homepage = "https://mkvtoolnix.download/"; 147 - license = licenses.gpl2Only; 148 mainProgram = if withGUI then "mkvtoolnix-gui" else "mkvtoolnix"; 149 - maintainers = with maintainers; [ 150 codyopel 151 rnhmjoj 152 ]; 153 - platforms = platforms.unix; 154 }; 155 - }
··· 1 { 2 lib, 3 stdenv, 4 + fetchFromGitea, 5 pkg-config, 6 autoreconfHook, 7 rake, ··· 9 cmark, 10 docbook_xsl, 11 expat, 12 file, 13 flac, 14 fmt, ··· 24 libxslt, 25 nlohmann_json, 26 pugixml, 27 + qt6, 28 utf8cpp, 29 xdg-utils, 30 zlib, 31 + nix-update-script, 32 withGUI ? true, 33 }: 34 35 let ··· 50 ''; 51 52 in 53 + stdenv.mkDerivation (finalAttrs: { 54 pname = "mkvtoolnix"; 55 + version = "91.0"; 56 57 + src = fetchFromGitea { 58 + domain = "codeberg.org"; 59 owner = "mbunkus"; 60 repo = "mkvtoolnix"; 61 + tag = "release-${finalAttrs.version}"; 62 + hash = "sha256-cBzW8zj2JxzhdMkvs8nWiBID/8FSMT7FkrZ78c0f0ts="; 63 }; 64 65 + passthru = { 66 + updateScript = nix-update-script { 67 + extraArgs = [ "--version-regex=release-(.*)" ]; 68 + }; 69 + }; 70 71 nativeBuildInputs = [ 72 autoreconfHook ··· 76 libxslt 77 pkg-config 78 rake 79 + ] ++ optionals withGUI [ qt6.wrapQtAppsHook ]; 80 81 # qtbase and qtmultimedia are needed without the GUI 82 buildInputs = ··· 94 libvorbis 95 nlohmann_json 96 pugixml 97 + qt6.qtbase 98 + qt6.qtmultimedia 99 utf8cpp 100 xdg-utils 101 zlib 102 ] 103 ++ optionals withGUI [ cmark ] 104 + ++ optionals stdenv.hostPlatform.isLinux [ qt6.qtwayland ]; 105 106 # autoupdate is not needed but it silences a ton of pointless warnings 107 postPatch = '' ··· 113 "--disable-debug" 114 "--disable-precompiled-headers" 115 "--disable-profiling" 116 "--disable-update-check" 117 "--enable-optimization" 118 "--with-boost-libdir=${getLib boost}/lib" ··· 137 wrapQtApp $out/bin/mkvtoolnix-gui 138 ''; 139 140 + meta = { 141 description = "Cross-platform tools for Matroska"; 142 homepage = "https://mkvtoolnix.download/"; 143 + license = lib.licenses.gpl2Only; 144 mainProgram = if withGUI then "mkvtoolnix-gui" else "mkvtoolnix"; 145 + maintainers = with lib.maintainers; [ 146 codyopel 147 rnhmjoj 148 ]; 149 + platforms = lib.platforms.unix; 150 }; 151 + })
-2
pkgs/top-level/all-packages.nix
··· 10644 ; 10645 }; 10646 10647 - mkvtoolnix = qt6Packages.callPackage ../applications/video/mkvtoolnix { }; 10648 - 10649 mkvtoolnix-cli = mkvtoolnix.override { 10650 withGUI = false; 10651 };
··· 10644 ; 10645 }; 10646 10647 mkvtoolnix-cli = mkvtoolnix.override { 10648 withGUI = false; 10649 };