commit 6be65cb82fec5dcfb8e3c86e3d2d0caeba115cca · pyrox.dev/nixpkgs

+23 -27

pkgs/applications/video/mkvtoolnix/default.nix pkgs/by-name/mk/mkvtoolnix/package.nix

···

       1
       1
        
       {

     

       2
       2
        
         lib,

     

       3
       3
        
         stdenv,

     

       4
       4
       -
         fetchFromGitLab,

     

       4
       4
       +
         fetchFromGitea,

     

       5
       5
        
         pkg-config,

     

       6
       6
        
         autoreconfHook,

     

       7
       7
        
         rake,

     
···

       9
       9
        
         cmark,

     

       10
       10
        
         docbook_xsl,

     

       11
       11
        
         expat,

     

       12
       12
       -
         fetchpatch2,

     

       13
       12
        
         file,

     

       14
       13
        
         flac,

     

       15
       14
        
         fmt,

     
···

       25
       24
        
         libxslt,

     

       26
       25
        
         nlohmann_json,

     

       27
       26
        
         pugixml,

     

       28
       28
       -
         qtbase,

     

       29
       29
       -
         qtmultimedia,

     

       30
       30
       -
         qtwayland,

     

       27
       27
       +
         qt6,

     

       31
       28
        
         utf8cpp,

     

       32
       29
        
         xdg-utils,

     

       33
       30
        
         zlib,

     

       31
       31
       +
         nix-update-script,

     

       34
       32
        
         withGUI ? true,

     

       35
       35
       -
         wrapQtAppsHook,

     

       36
       33
        
       }:

     

       37
       34
        
       

     

       38
       35
        
       let

     
···

       53
       50
        
         '';

     

       54
       51
        
       

     

       55
       52
        
       in

     

       56
       56
       -
       stdenv.mkDerivation rec {

     

       53
       53
       +
       stdenv.mkDerivation (finalAttrs: {

     

       57
       54
        
         pname = "mkvtoolnix";

     

       58
       58
       -
         version = "87.0";

     

       55
       55
       +
         version = "91.0";

     

       59
       56
        
       

     

       60
       60
       -
         src = fetchFromGitLab {

     

       57
       57
       +
         src = fetchFromGitea {

     

       58
       58
       +
           domain = "codeberg.org";

     

       61
       59
        
           owner = "mbunkus";

     

       62
       60
        
           repo = "mkvtoolnix";

     

       63
       63
       -
           rev = "release-${version}";

     

       64
       64
       -
           hash = "sha256-UU57ZgH1sxCXspwfKXScw08aJYiv+k526U8q8N1tA+4=";

     

       61
       61
       +
           tag = "release-${finalAttrs.version}";

     

       62
       62
       +
           hash = "sha256-cBzW8zj2JxzhdMkvs8nWiBID/8FSMT7FkrZ78c0f0ts=";

     

       65
       63
        
         };

     

       66
       64
        
       

     

       67
       67
       -
         patches = [

     

       68
       68
       -
           (fetchpatch2 {

     

       69
       69
       -
             url = "https://gitlab.com/mbunkus/mkvtoolnix/-/commit/fc83003f541ac690fe308c3f4ac36e62814a40db.diff";

     

       70
       70
       -
             hash = "sha256-HOS79g5xm70upV5Okv1COEg0SanXs7brRRB59Ofx5HA=";

     

       71
       71
       -
           })

     

       72
       72
       -
         ];

     

       65
       65
       +
         passthru = {

     

       66
       66
       +
           updateScript = nix-update-script {

     

       67
       67
       +
             extraArgs = [ "--version-regex=release-(.*)" ];

     

       68
       68
       +
           };

     

       69
       69
       +
         };

     

       73
       70
        
       

     

       74
       71
        
         nativeBuildInputs = [

     

       75
       72
        
           autoreconfHook

     
···

       79
       76
        
           libxslt

     

       80
       77
        
           pkg-config

     

       81
       78
        
           rake

     

       82
       82
       -
         ] ++ optionals withGUI [ wrapQtAppsHook ];

     

       79
       79
       +
         ] ++ optionals withGUI [ qt6.wrapQtAppsHook ];

     

       83
       80
        
       

     

       84
       81
        
         # qtbase and qtmultimedia are needed without the GUI

     

       85
       82
        
         buildInputs =

     
···

       97
       94
        
             libvorbis

     

       98
       95
        
             nlohmann_json

     

       99
       96
        
             pugixml

     

       100
       100
       -
             qtbase

     

       101
       101
       -
             qtmultimedia

     

       97
       97
       +
             qt6.qtbase

     

       98
       98
       +
             qt6.qtmultimedia

     

       102
       99
        
             utf8cpp

     

       103
       100
        
             xdg-utils

     

       104
       101
        
             zlib

     

       105
       102
        
           ]

     

       106
       103
        
           ++ optionals withGUI [ cmark ]

     

       107
       107
       -
           ++ optionals stdenv.hostPlatform.isLinux [ qtwayland ];

     

       104
       104
       +
           ++ optionals stdenv.hostPlatform.isLinux [ qt6.qtwayland ];

     

       108
       105
        
       

     

       109
       106
        
         # autoupdate is not needed but it silences a ton of pointless warnings

     

       110
       107
        
         postPatch = ''

     
···

       116
       113
        
           "--disable-debug"

     

       117
       114
        
           "--disable-precompiled-headers"

     

       118
       115
        
           "--disable-profiling"

     

       119
       119
       -
           "--disable-static-qt"

     

       120
       116
        
           "--disable-update-check"

     

       121
       117
        
           "--enable-optimization"

     

       122
       118
        
           "--with-boost-libdir=${getLib boost}/lib"

     
···

       141
       137
        
           wrapQtApp $out/bin/mkvtoolnix-gui

     

       142
       138
        
         '';

     

       143
       139
        
       

     

       144
       144
       -
         meta = with lib; {

     

       140
       140
       +
         meta = {

     

       145
       141
        
           description = "Cross-platform tools for Matroska";

     

       146
       142
        
           homepage = "https://mkvtoolnix.download/";

     

       147
       147
       -
           license = licenses.gpl2Only;

     

       143
       143
       +
           license = lib.licenses.gpl2Only;

     

       148
       144
        
           mainProgram = if withGUI then "mkvtoolnix-gui" else "mkvtoolnix";

     

       149
       149
       -
           maintainers = with maintainers; [

     

       145
       145
       +
           maintainers = with lib.maintainers; [

     

       150
       146
        
             codyopel

     

       151
       147
        
             rnhmjoj

     

       152
       148
        
           ];

     

       153
       153
       -
           platforms = platforms.unix;

     

       149
       149
       +
           platforms = lib.platforms.unix;

     

       154
       150
        
         };

     

       155
       155
       -
       }

     

       151
       151
       +
       })

-2

pkgs/top-level/all-packages.nix

···

       10644
       10644
        
             ;

     

       10645
       10645
        
         };

     

       10646
       10646
        
       

     

       10647
       10647
       -
         mkvtoolnix = qt6Packages.callPackage ../applications/video/mkvtoolnix { };

     

       10648
       10648
       -
       

     

       10649
       10647
        
         mkvtoolnix-cli = mkvtoolnix.override {

     

       10650
       10648
        
           withGUI = false;

     

       10651
       10649
        
         };