From 6877159dc0cbd066d233d93c92b47e0f9d87eac9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20Min=C3=A1=C5=99?= <mic.liamg@gmail.com>
Date: Mon, 24 Jun 2019 16:19:48 +0200
Subject: [PATCH] addressed comments
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- ditched configurePhase and installPhase
- ffmpeg no longer optional

Signed-off-by: Michal Minář <mic.liamg@gmail.com>
---
 pkgs/applications/misc/megasync/default.nix | 66 ++++++++-------------
 1 file changed, 24 insertions(+), 42 deletions(-)

diff --git a/pkgs/applications/misc/megasync/default.nix b/pkgs/applications/misc/megasync/default.nix
index a04370f3acd..c8c49d7b5d7 100644
--- a/pkgs/applications/misc/megasync/default.nix
+++ b/pkgs/applications/misc/megasync/default.nix
@@ -1,14 +1,12 @@
-{ lib
-, stdenv
+{ stdenv
 , autoconf
 , automake
-, bash
-, bashInteractive
 , c-ares
 , cryptopp
 , curl
 , doxygen
 , fetchFromGitHub
+, ffmpeg
 , hicolor-icon-theme
 , libmediainfo
 , libraw
@@ -17,18 +15,14 @@
 , libuv
 , libzen
 , lsb-release
-, makeDesktopItem
 , pkgconfig
 , qt5
 , sqlite
 , swig
 , unzip
 , wget
-, enableFFmpeg   ? true, ffmpeg  ? ffmpeg
 }:
 
-assert enableFFmpeg   -> ffmpeg != null;
-
 stdenv.mkDerivation rec {
   name = "megasync-${version}";
   version = "4.1.1.0";
@@ -41,17 +35,6 @@ stdenv.mkDerivation rec {
     fetchSubmodules = true;
   };
 
-  desktopItem = makeDesktopItem {
-    name = "megasync";
-    exec = "megasync";
-    icon = "megasync";
-    comment = meta.description;
-    desktopName = "MEGASync";
-    genericName = "File Synchronizer";
-    categories = "Network;FileTransfer;";
-    startupNotify = "false";
-  };
-
   nativeBuildInputs = [
     autoconf
     automake
@@ -66,7 +49,7 @@ stdenv.mkDerivation rec {
     c-ares
     cryptopp
     curl
-    #freeimage    # unreferenced
+    ffmpeg
     hicolor-icon-theme
     libmediainfo
     libraw
@@ -79,22 +62,30 @@ stdenv.mkDerivation rec {
     sqlite
     unzip
     wget
-  ] ++ stdenv.lib.optionals enableFFmpeg   [ ffmpeg ];
+  ];
 
   patchPhase = ''
     for file in $(find src/ -type f \( -iname configure -o -iname \*.sh  \) ); do
-      substituteInPlace "$file" \
-        --replace "/bin/bash" "${bashInteractive}/bin/bash"
+      substituteInPlace "$file" --replace "/bin/bash" "${stdenv.shell}"
     done
+
+    # Distro and version targets attempt to use lsb_release which is broken
+    # (see issue: https://github.com/NixOS/nixpkgs/issues/22729)
+    substituteInPlace src/MEGASync/platform/platform.pri \
+      --replace "INSTALLS += distro" "# INSTALLS += distro"
+
+    # megasync target is not part of the install rule thanks to a commented block
+    sed -i '/#\s*isEmpty(PREFIX)/,/#\s*INSTALLS\s*+=\s*target/s/^\s*#//' \
+      src/MEGASync/MEGASync.pro
   '';
 
+  dontUseQmakeConfigure = true;
+
   preConfigure = ''
     cd src/MEGASync/mega
     ./autogen.sh
   '';
 
-  configureScript = "./configure";
-
   configureFlags = [
           "--disable-examples"
           "--disable-java"
@@ -103,34 +94,25 @@ stdenv.mkDerivation rec {
           "--with-cares"
           "--with-cryptopp"
           "--with-curl"
+          "--with-ffmpeg"
           "--without-freeimage"  # unreferenced even when found
           "--without-readline"
           "--without-termcap"
           "--with-sodium"
           "--with-sqlite"
           "--with-zlib"
-    ] ++ stdenv.lib.optionals enableFFmpeg ["--with-ffmpeg"];
+    ];
 
-  # TODO: unless overriden, qmake is called instead ??
-  configurePhase = ''
-    runHook preConfigure
-    ./configure ${toString configureFlags}
-    runHook postConfigure
+  postConfigure = ''
+    cd ../..
   '';
 
-  postConfigure = "cd ../..";
-
   preBuild = ''
     qmake CONFIG+="release" MEGA.pro
-    lrelease MEGASync/MEGASync.pro
-  '';
-
-  # TODO: install bindings
-  installPhase = ''
-    mkdir -p $out/share/icons
-    install -Dm 755 MEGASync/megasync $out/bin/megasync
-    cp -r ${desktopItem}/share/applications $out/share
-    cp MEGASync/gui/images/uptodate.svg $out/share/icons/megasync.svg
+    pushd MEGASync
+      lrelease MEGASync.pro
+      DESKTOP_DESTDIR="$out" qmake PREFIX="$out" -o Makefile MEGASync.pro CONFIG+=release
+    popd
   '';
 
   meta = with stdenv.lib; {