Skip to content

Commit

Permalink
bomi: use qt5's mkDerivation
Browse files Browse the repository at this point in the history
Wrap Qt program manually, remove makeWrapper from nativeBuildInputs.
  • Loading branch information
mmilata committed Apr 22, 2020
1 parent 21d3ce5 commit 98f1266
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions pkgs/applications/video/bomi/default.nix
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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";

Expand Down Expand Up @@ -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'"}
'';

Expand All @@ -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";
Expand Down

0 comments on commit 98f1266

Please sign in to comment.