Unverified Commit c8b53289 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

megasync: 5.6.1.0 -> 5.7.1.0 (#377302)

parents 5278e867 6686f92e

pkgs/applications/misc/megasync/default.nix

+6 −5
Original line number Diff line number Diff line
@@ -37,13 +37,13 @@ 
}:

mkDerivation rec {

  pname = "megasync";

  version = "5.6.1.0";

  version = "5.7.1.0";



  src = fetchFromGitHub rec {

    owner = "meganz";

    repo = "MEGAsync";

    rev = "v${version}_Linux";

    hash = "sha256-EjXmx+beYH3J60RidkEbZHFS5ZAOpJKmNC+WCIM84RA=";

    hash = "sha256-lbAI17CyHrppMnxQDV5g0IE+I7Y0DwU+h5MSFZclD2A=";

    fetchSubmodules = false; # DesignTokensImporter cannot be fetched, see #1010 in github:meganz/megasync

    leaveDotGit = true;

    postFetch = ''
@@ -94,13 +94,13 @@ mkDerivation rec { 


  patches = [

    (fetchpatch {

      url = "https://aur.archlinux.org/cgit/aur.git/plain/020-megasync-sdk-fix-cmake-dependencies-detection.patch?h=megasync&id=4b1eca5bc0d75709dee3a1260264d1b6386d3398";

      hash = "sha256-y3WhLkawFzQRzzRBpioiyAT3F1NDQvYBOm2888g5V5c=";

      url = "https://aur.archlinux.org/cgit/aur.git/plain/020-megasync-sdk-fix-cmake-dependencies-detection.patch?h=megasync&id=ff59780039697591e7e3a966db058b23bee0451c";

      hash = "sha256-hQY6tMwiV3B6M6WiFdOESdhahAtuWjdoj2eI2mst/K8=";

      extraPrefix = "src/MEGASync/mega/";

      stripLen = true;

    })

    (fetchpatch {

      url = "https://aur.archlinux.org/cgit/aur.git/plain/030-megasync-app-fix-cmake-dependencies-detection.patch?h=megasync&id=4b1eca5bc0d75709dee3a1260264d1b6386d3398";

      url = "https://aur.archlinux.org/cgit/aur.git/plain/030-megasync-app-fix-cmake-dependencies-detection.patch?h=megasync&id=ff59780039697591e7e3a966db058b23bee0451c";

      hash = "sha256-11XWctv1veUEguc9Xvz2hMYw26CaCwu6M4hyA+5r81U=";

    })

    ./megasync-fix-cmake-install-bindir.patch
@@ -108,6 +108,7 @@ mkDerivation rec { 
  ];



  postPatch = ''

    substituteInPlace cmake/modules/desktopapp_options.cmake --replace-fail "ENABLE_ISOLATED_GFX ON" "ENABLE_ISOLATED_GFX OFF"

    for file in $(find src/ -type f \( -iname configure -o -iname \*.sh \) ); do

      substituteInPlace "$file" --replace "/bin/bash" "${stdenv.shell}"

    done

pkgs/applications/misc/megasync/megasync-fix-cmake-install-bindir.patch

+4 −4
Original line number Diff line number Diff line 
diff --git a/contrib/cmake/modules/desktopapp_configuration.cmake b/contrib/cmake/modules/desktopapp_configuration.cmake

index 8e9f35cb2..b62f5a9b5 100644

--- a/contrib/cmake/modules/desktopapp_configuration.cmake

+++ b/contrib/cmake/modules/desktopapp_configuration.cmake

diff --git a/cmake/modules/desktopapp_configuration.cmake b/cmake/modules/desktopapp_configuration.cmake

index a14ac8669..e80c5e9f6 100644

--- a/cmake/modules/desktopapp_configuration.cmake

+++ b/cmake/modules/desktopapp_configuration.cmake

@@ -30,7 +30,6 @@ if(UNIX AND NOT APPLE)

     #       Used for building packages: in which install dir is a path construction folder that will not be there in packages