Merge pull request #274346 from peterhoeg/f/mkvtoolnix
mkvtoolnix: use utf8cpp from nixpkgs
This commit is contained in:
commit
808d2bd0ae
|
@ -25,6 +25,7 @@
|
|||
, pugixml
|
||||
, qtbase
|
||||
, qtmultimedia
|
||||
, utf8cpp
|
||||
, xdg-utils
|
||||
, zlib
|
||||
, withGUI ? true
|
||||
|
@ -32,7 +33,8 @@
|
|||
}:
|
||||
|
||||
let
|
||||
inherit (lib) enableFeature optional optionals optionalString;
|
||||
inherit (lib)
|
||||
enableFeature getDev getLib optionals optionalString;
|
||||
|
||||
phase = name: args:
|
||||
''
|
||||
|
@ -64,10 +66,9 @@ stdenv.mkDerivation rec {
|
|||
pkg-config
|
||||
rake
|
||||
]
|
||||
++ optional withGUI wrapQtAppsHook;
|
||||
++ optionals withGUI [ wrapQtAppsHook ];
|
||||
|
||||
# 1. qtbase and qtmultimedia are needed without the GUI
|
||||
# 2. we have utf8cpp in nixpkgs but it doesn't find it
|
||||
# qtbase and qtmultimedia are needed without the GUI
|
||||
buildInputs = [
|
||||
boost
|
||||
expat
|
||||
|
@ -84,11 +85,12 @@ stdenv.mkDerivation rec {
|
|||
pugixml
|
||||
qtbase
|
||||
qtmultimedia
|
||||
utf8cpp
|
||||
xdg-utils
|
||||
zlib
|
||||
]
|
||||
++ optional withGUI cmark
|
||||
++ optional stdenv.isDarwin libiconv;
|
||||
++ optionals withGUI [ cmark ]
|
||||
++ optionals stdenv.isDarwin [ libiconv ];
|
||||
|
||||
# autoupdate is not needed but it silences a ton of pointless warnings
|
||||
postPatch = ''
|
||||
|
@ -103,9 +105,11 @@ stdenv.mkDerivation rec {
|
|||
"--disable-static-qt"
|
||||
"--disable-update-check"
|
||||
"--enable-optimization"
|
||||
"--with-boost-libdir=${lib.getLib boost}/lib"
|
||||
"--with-boost-libdir=${getLib boost}/lib"
|
||||
"--with-docbook-xsl-root=${docbook_xsl}/share/xml/docbook-xsl"
|
||||
"--with-gettext"
|
||||
"--with-extra-includes=${getDev utf8cpp}/include/utf8cpp"
|
||||
"--with-extra-libs=${getLib utf8cpp}/lib"
|
||||
(enableFeature withGUI "gui")
|
||||
];
|
||||
|
||||
|
|
|
@ -24030,7 +24030,7 @@ with pkgs;
|
|||
|
||||
minizip-ng = callPackage ../development/libraries/minizip-ng { };
|
||||
|
||||
mkvtoolnix = libsForQt5.callPackage ../applications/video/mkvtoolnix {
|
||||
mkvtoolnix = qt6Packages.callPackage ../applications/video/mkvtoolnix {
|
||||
stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user