diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-04-13 15:36:35 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-04-13 16:09:40 +0300 |
| commit | e88a986ca4a05c70224054debe71fd736ce51f7a (patch) | |
| tree | 094db0dad8022cc72aa1ed207a0c2e1c1ff72b57 /pkgs | |
| parent | 74f7916a9a4c0ebe8d7c5d5861c5694ea2d1583e (diff) | |
| download | nixpkgs-e88a986ca4a05c70224054debe71fd736ce51f7a.tar nixpkgs-e88a986ca4a05c70224054debe71fd736ce51f7a.tar.gz nixpkgs-e88a986ca4a05c70224054debe71fd736ce51f7a.tar.bz2 nixpkgs-e88a986ca4a05c70224054debe71fd736ce51f7a.tar.lz nixpkgs-e88a986ca4a05c70224054debe71fd736ce51f7a.tar.xz nixpkgs-e88a986ca4a05c70224054debe71fd736ce51f7a.tar.zst nixpkgs-e88a986ca4a05c70224054debe71fd736ce51f7a.zip | |
bomi: use wrapQtProgram
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/video/bomi/default.nix | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/pkgs/applications/video/bomi/default.nix b/pkgs/applications/video/bomi/default.nix index f1a999e5554..f9301781fc1 100644 --- a/pkgs/applications/video/bomi/default.nix +++ b/pkgs/applications/video/bomi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, perl, python, which, makeWrapper +{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, perl, python, which, makeQtWrapper , libX11, libxcb, mesa , qtbase, qtdeclarative, qtquickcontrols, qttools, qtx11extras , ffmpeg @@ -27,9 +27,6 @@ assert pulseSupport -> libpulseaudio != null; assert cddaSupport -> libcdda != null; assert youtubeSupport -> youtube-dl != null; -let qtPath = makeSearchPath "lib/qt5/qml" [ qtdeclarative qtquickcontrols ]; -in - stdenv.mkDerivation rec { name = "bomi-${version}"; version = "0.9.11"; @@ -56,6 +53,7 @@ stdenv.mkDerivation rec { libvdpau libva libbluray + qtdeclarative qtquickcontrols ] ++ optional jackSupport jack @@ -74,8 +72,7 @@ stdenv.mkDerivation rec { ''; postInstall = '' - wrapProgram $out/bin/bomi \ - --set QML2_IMPORT_PATH ${qtPath} \ + wrapQtProgram $out/bin/bomi \ ${optionalString youtubeSupport "--prefix PATH ':' '${youtube-dl}/bin'"} ''; @@ -87,7 +84,7 @@ stdenv.mkDerivation rec { ++ optional cddaSupport "--enable-cdda" ; - nativeBuildInputs = [ pkgconfig perl python which qttools makeWrapper ]; + nativeBuildInputs = [ pkgconfig perl python which qttools makeQtWrapper ]; enableParallelBuilding = true; |