qt5: remove makeQtWrapper
This commit is contained in:
@@ -1,20 +1,20 @@
|
||||
{ stdenv, lib, fetchFromGitHub, extra-cmake-modules, makeQtWrapper
|
||||
{ mkDerivation, lib, fetchFromGitHub, extra-cmake-modules
|
||||
, qtbase, qtmultimedia, qtquick1, qttools
|
||||
, mesa, libX11
|
||||
, libass, openal, ffmpeg, libuchardet
|
||||
, alsaLib, libpulseaudio, libva
|
||||
}:
|
||||
|
||||
with stdenv.lib;
|
||||
with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
mkDerivation rec {
|
||||
name = "libqtav-${version}";
|
||||
|
||||
# Awaiting upcoming `v1.12.0` release. `v1.11.0` is not supporting cmake which is the
|
||||
# the reason behind taking an unstable git rev.
|
||||
version = "unstable-2017-03-30";
|
||||
|
||||
nativeBuildInputs = [ extra-cmake-modules makeQtWrapper qttools ];
|
||||
nativeBuildInputs = [ extra-cmake-modules qttools ];
|
||||
buildInputs = [
|
||||
qtbase qtmultimedia qtquick1
|
||||
mesa libX11
|
||||
@@ -45,12 +45,6 @@ stdenv.mkDerivation rec {
|
||||
cp -a "./bin/"* "$out/bin"
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
for i in `find $out/bin -maxdepth 1 -xtype f -executable`; do
|
||||
wrapQtProgram "$i"
|
||||
done
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "A multimedia playback framework based on Qt + FFmpeg.";
|
||||
#license = licenses.lgpl21; # For the libraries / headers only.
|
||||
|
||||
Reference in New Issue
Block a user