public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bomi: use qt5's mkDerivation

Browse Source 
Wrap Qt program manually, remove makeWrapper from nativeBuildInputs.
This commit is contained in:
Martin Milata 2020-04-07 22:31:44 +02:00
parent 21d3ce5887
commit 98f126615f
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/applications/video/bomi/default.nix
View File

@ -1,7 +1,7 @@
{ config, stdenv, fetchFromGitHub { mkDerivation, config, stdenv, fetchFromGitHub
, fetchpatch, pkgconfig, perl, python, which , fetchpatch, pkgconfig, perl, python, which
, libX11, libxcb, libGLU, libGL , libX11, libxcb, libGLU, libGL
, qtbase, qtdeclarative, qtquickcontrols, qttools, qtx11extras, qmake, makeWrapper , qtbase, qtdeclarative, qtquickcontrols, qttools, qtx11extras, qmake
, libchardet , libchardet
, ffmpeg , ffmpeg
@ -29,7 +29,7 @@ assert pulseSupport -> libpulseaudio != null;
assert cddaSupport -> libcdda != null; assert cddaSupport -> libcdda != null;
assert youtubeSupport -> youtube-dl != null; assert youtubeSupport -> youtube-dl != null;
stdenv.mkDerivation rec { mkDerivation rec {
pname = "bomi"; pname = "bomi";
version = "0.9.11"; version = "0.9.11";
@ -90,8 +90,9 @@ stdenv.mkDerivation rec {
patchShebangs build-mpv patchShebangs build-mpv
''; '';
dontWrapQtApps = true;
postInstall = '' postInstall = ''
wrapProgram $out/bin/bomi \ wrapQtApp $out/bin/bomi \
${optionalString youtubeSupport "--prefix PATH ':' '${youtube-dl}/bin'"} ${optionalString youtubeSupport "--prefix PATH ':' '${youtube-dl}/bin'"}
''; '';
@ -105,7 +106,7 @@ stdenv.mkDerivation rec {
++ optional cddaSupport "--enable-cdda" ++ optional cddaSupport "--enable-cdda"
; ;
nativeBuildInputs = [ makeWrapper pkgconfig perl python which qttools qmake ]; nativeBuildInputs = [ pkgconfig perl python which qttools qmake ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Powerful and easy-to-use multimedia player"; description = "Powerful and easy-to-use multimedia player";