commit c8b53289d49f9f4c0b5cbbeca4c779d63ea51863 · pyrox.dev/nixpkgs

+6 -5

pkgs/applications/misc/megasync/default.nix

···

       37
        
       }:

     

       38
        
       mkDerivation rec {

     

       39
        
         pname = "megasync";

     

       40
       -
         version = "5.6.1.0";

     

       41
        
       

     

       42
        
         src = fetchFromGitHub rec {

     

       43
        
           owner = "meganz";

     

       44
        
           repo = "MEGAsync";

     

       45
        
           rev = "v${version}_Linux";

     

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

     

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

     

       48
        
           leaveDotGit = true;

     

       49
        
           postFetch = ''

     
···

       94
        
       

     

       95
        
         patches = [

     

       96
        
           (fetchpatch {

     

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

     

       98
       -
             hash = "sha256-y3WhLkawFzQRzzRBpioiyAT3F1NDQvYBOm2888g5V5c=";

     

       99
        
             extraPrefix = "src/MEGASync/mega/";

     

       100
        
             stripLen = true;

     

       101
        
           })

     

       102
        
           (fetchpatch {

     

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

     

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

     

       105
        
           })

     

       106
        
           ./megasync-fix-cmake-install-bindir.patch

     
···

       108
        
         ];

     

       109
        
       

     

       110
        
         postPatch = ''

     

       0
        
       
     

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

     

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

     

       113
        
           done

···

       37
        
       }:

     

       38
        
       mkDerivation rec {

     

       39
        
         pname = "megasync";

     

       40
       +
         version = "5.7.1.0";

     

       41
        
       

     

       42
        
         src = fetchFromGitHub rec {

     

       43
        
           owner = "meganz";

     

       44
        
           repo = "MEGAsync";

     

       45
        
           rev = "v${version}_Linux";

     

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

     

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

     

       48
        
           leaveDotGit = true;

     

       49
        
           postFetch = ''

     
···

       94
        
       

     

       95
        
         patches = [

     

       96
        
           (fetchpatch {

     

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

     

       98
       +
             hash = "sha256-hQY6tMwiV3B6M6WiFdOESdhahAtuWjdoj2eI2mst/K8=";

     

       99
        
             extraPrefix = "src/MEGASync/mega/";

     

       100
        
             stripLen = true;

     

       101
        
           })

     

       102
        
           (fetchpatch {

     

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

     

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

     

       105
        
           })

     

       106
        
           ./megasync-fix-cmake-install-bindir.patch

     
···

       108
        
         ];

     

       109
        
       

     

       110
        
         postPatch = ''

     

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

     

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

     

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

     

       114
        
           done

+4 -4

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

···

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

     

       2
       -
       index 8e9f35cb2..b62f5a9b5 100644

     

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

     

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

     

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

     

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

     

       7

···

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

     

       2
       +
       index a14ac8669..e80c5e9f6 100644

     

       3
       +
       --- a/cmake/modules/desktopapp_configuration.cmake

     

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

     

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

     

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

     

       7