diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-04-25 07:53:37 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-04-25 07:53:37 +0200 |
| commit | bb10352242dceb863069797bb92131944b0ac62f (patch) | |
| tree | d3f5ceea6723e3d6c901652146e41ffe45100c9b /pkgs/applications/video/bomi/default.nix | |
| parent | 7fb1ff90031c59cbc9ef79224516a74bc138c7a6 (diff) | |
| parent | 5c70040db2dd2123f7728f1bdcd40d5018de0ef9 (diff) | |
| download | nixlib-bb10352242dceb863069797bb92131944b0ac62f.tar nixlib-bb10352242dceb863069797bb92131944b0ac62f.tar.gz nixlib-bb10352242dceb863069797bb92131944b0ac62f.tar.bz2 nixlib-bb10352242dceb863069797bb92131944b0ac62f.tar.lz nixlib-bb10352242dceb863069797bb92131944b0ac62f.tar.xz nixlib-bb10352242dceb863069797bb92131944b0ac62f.tar.zst nixlib-bb10352242dceb863069797bb92131944b0ac62f.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications/video/bomi/default.nix')
| -rw-r--r-- | pkgs/applications/video/bomi/default.nix | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/applications/video/bomi/default.nix b/pkgs/applications/video/bomi/default.nix index 7ba37936c686..d812ac488742 100644 --- a/pkgs/applications/video/bomi/default.nix +++ b/pkgs/applications/video/bomi/default.nix @@ -1,7 +1,7 @@ -{ config, stdenv, fetchFromGitHub +{ mkDerivation, config, stdenv, fetchFromGitHub , fetchpatch, pkgconfig, perl, python, which , libX11, libxcb, libGLU, libGL -, qtbase, qtdeclarative, qtquickcontrols, qttools, qtx11extras, qmake, makeWrapper +, qtbase, qtdeclarative, qtquickcontrols, qttools, qtx11extras, qmake , libchardet , ffmpeg @@ -29,7 +29,7 @@ assert pulseSupport -> libpulseaudio != null; assert cddaSupport -> libcdda != null; assert youtubeSupport -> youtube-dl != null; -stdenv.mkDerivation rec { +mkDerivation rec { pname = "bomi"; version = "0.9.11"; @@ -90,8 +90,9 @@ stdenv.mkDerivation rec { patchShebangs build-mpv ''; + dontWrapQtApps = true; postInstall = '' - wrapProgram $out/bin/bomi \ + wrapQtApp $out/bin/bomi \ ${optionalString youtubeSupport "--prefix PATH ':' '${youtube-dl}/bin'"} ''; @@ -105,7 +106,7 @@ stdenv.mkDerivation rec { ++ optional cddaSupport "--enable-cdda" ; - nativeBuildInputs = [ makeWrapper pkgconfig perl python which qttools qmake ]; + nativeBuildInputs = [ pkgconfig perl python which qttools qmake ]; meta = with stdenv.lib; { description = "Powerful and easy-to-use multimedia player"; |