1 files changed, 14 insertions, 22 deletions
diff --git a/makefu/5pkgs/custom/qcma/default.nix b/makefu/5pkgs/custom/qcma/default.nix
index d67cda142..dfb57c880 100644
--- a/makefu/5pkgs/custom/qcma/default.nix
+++ b/makefu/5pkgs/custom/qcma/default.nix
@@ -1,6 +1,9 @@
 { lib, stdenv, fetchFromGitHub, fetchgit, libusb, libtool, autoconf, pkgconfig, git,
-gettext, automake, libxml2 , qmake,
-qtbase, qttools, qtmultimedia, libnotify, ffmpeg, gdk_pixbuf }:
+gettext, automake, libxml2 
+, autoreconfHook
+, qmake4Hook
+, qmake
+, qtbase, qttools, qtmultimedia, libnotify, ffmpeg, gdk_pixbuf }:
 let
   libvitamtp = stdenv.mkDerivation rec {
     name = "libvitamtp-${version}";
@@ -13,8 +16,8 @@ let
       sha256 = "09c9f7gqpyicfpnhrfb4r67s2hci6hh31bzmqlpds4fywv5mzaf8";
     };
 
-    buildInputs = [ libusb libxml2 libtool autoconf automake gettext pkgconfig ];
-    preConfigure = "sh ./autogen.sh";
+    buildInputs = [ libusb libxml2 libtool autoconf automake gettext pkgconfig
+    autoreconfHook ];
 
     meta = {
       description = "Content Manager Assistant for the PS Vita";
@@ -26,40 +29,29 @@ let
   };
 in stdenv.mkDerivation rec {
   name = "qcma-${version}";
-  version = "0.3.13";
+  version = "8e6cafedc0f47733f33323f829624e3fc847a176";
 
-  src = fetchgit {
-    url = "git://github.com/codestation/qcma.git";
-    rev = "refs/tags/v"+version;
-    leaveDotGit = true;
-    sha256 = "164abjwlw2nw2i30wlwpsavz1zjkp6a14yprvinma5hflkw4yj6i";
+  src = fetchFromGitHub {
+    owner = "codestation";
+    repo = "qcma";
+    rev = version;
+    sha256 = "1l95kx3x4pf5iwmwigbch5c6n2h27lls5qiy4xh15v59p5442yw5";
   };
 
   preConfigure = ''
     lrelease common/resources/translations/*.ts
   '';
 
-  # TODO: manually adding qtbase and qtmultimedia to the library path is shit,
-  # this should be done somewhere before when building the project, idk.
-  installPhase = ''
-    make INSTALL_ROOT="$(out)" install
-    for i in qcma qcma_cli; do
-      wrapQtProgram $out/bin/$i --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [
-    qtbase qtmultimedia ]}
-    done
-  '';
-
   enableParallelBuilding = true;
 
   buildInputs = [ gdk_pixbuf ffmpeg libnotify libvitamtp git qtmultimedia qtbase ];
-  nativeBuildInputs = [ qmake qttools pkgconfig ];
+  nativeBuildInputs = [ qttools pkgconfig qmake ];
 
   meta = {
     description = "Content Manager Assistant for the PS Vita";
     homepage = https://github.com/codestation/qcma;
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.linux;
-    broken = true;
     maintainers = with stdenv.lib.maintainers; [ makefu ];
   };
 }