summary refs log tree commit diff
path: root/pkgs/development/libraries/libqtav
diff options
context:
space:
mode:
authorThomas Tuegel <ttuegel@mailbox.org>2017-05-17 14:26:11 -0500
committerThomas Tuegel <ttuegel@mailbox.org>2017-06-18 08:44:42 -0500
commitc816bbc8a86c7ea6c09ca42e1694fe08003a55fc (patch)
tree036a3c0d8a3a6a4be068cf153a863fc0114ef28f /pkgs/development/libraries/libqtav
parent1607f51613fc63a6fbfc1884c55a9efea06161b3 (diff)
downloadnixpkgs-c816bbc8a86c7ea6c09ca42e1694fe08003a55fc.tar
nixpkgs-c816bbc8a86c7ea6c09ca42e1694fe08003a55fc.tar.gz
nixpkgs-c816bbc8a86c7ea6c09ca42e1694fe08003a55fc.tar.bz2
nixpkgs-c816bbc8a86c7ea6c09ca42e1694fe08003a55fc.tar.lz
nixpkgs-c816bbc8a86c7ea6c09ca42e1694fe08003a55fc.tar.xz
nixpkgs-c816bbc8a86c7ea6c09ca42e1694fe08003a55fc.tar.zst
nixpkgs-c816bbc8a86c7ea6c09ca42e1694fe08003a55fc.zip
qt5: remove makeQtWrapper
Diffstat (limited to 'pkgs/development/libraries/libqtav')
-rw-r--r--pkgs/development/libraries/libqtav/default.nix14
1 files changed, 4 insertions, 10 deletions
diff --git a/pkgs/development/libraries/libqtav/default.nix b/pkgs/development/libraries/libqtav/default.nix
index 7b421f4ca36..a79e6d90384 100644
--- a/pkgs/development/libraries/libqtav/default.nix
+++ b/pkgs/development/libraries/libqtav/default.nix
@@ -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.