libqtav: unstable-2017-03-30 -> 1.12.0

This was actually already mentioned in the comment above 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.

So version 1.12.0 has been released in the meantime and it's also needed
by the latest version of digiKam, which is the only package in nixpkgs
that depends on libqtav.

As we're going to bump digiKam, I think bumping this is safe as in the
worst case we can only make things broken which are already broken
(digiKam currently doesn't build).

The fixes for the CMakeLists.txt are now also no longer needed, so we
can safely drop them as well.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @jraygauthier

1 files changed, 4 insertions, 12 deletions

diff --git a/pkgs/development/libraries/libqtav/default.nix b/pkgs/development/libraries/libqtav/default.nix
index a79e6d90384..93d8ced49ce 100644
--- a/pkgs/development/libraries/libqtav/default.nix
+++ b/pkgs/development/libraries/libqtav/default.nix
@@ -9,13 +9,10 @@ with lib;
 
 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";
+  version = "1.12.0";
 
   nativeBuildInputs = [ extra-cmake-modules qttools ];
-  buildInputs = [ 
+  buildInputs = [
     qtbase qtmultimedia qtquick1
     mesa libX11
     libass openal ffmpeg libuchardet
@@ -23,18 +20,13 @@ mkDerivation rec {
   ];
 
   src = fetchFromGitHub {
-    sha256 = "1xw0ynm9w501651rna3ppf8p336ag1p60i9dxhghzm543l7as93v";
-    rev = "4b4ae3b470b2fcbbcf1b541c2537fb270ee0bcfa";
+    sha256 = "03ii9l38l3fsr27g42fx4151ipzkip2kr4akdr8x28sx5r9rr5m2";
+    rev = "v${version}";
     repo = "QtAV";
     owner = "wang-bin";
     fetchSubmodules = true;
   };
 
-  patchPhase = ''
-    sed -i -e 's#CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT#TRUE#g' ./CMakeLists.txt
-    sed -i -e 's#DESTINATION ''${QT_INSTALL_LIBS}/cmake#DESTINATION ''${QTAV_INSTALL_LIBS}/cmake#g' ./CMakeLists.txt
-  '';
-
   # Make sure libqtav finds its libGL dependancy at both link and run time
   # by adding mesa to rpath. Not sure why it wasn't done automatically like
   # the other libraries as `mesa` is part of our `buildInputs`.