diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-08-01 21:44:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-01 21:44:16 +0200 |
| commit | 965d4d3ce799aabc6e9fb57c4d2690ea797dcebb (patch) | |
| tree | ab03461d74097419d3fd09098deef2a521c94557 /pkgs/applications | |
| parent | 4619337a3bc7f004dbc3a2dc9b37f08178cc551a (diff) | |
| parent | 4091f2955ad26914eafd39ceb72f2cebefb1238f (diff) | |
Merge pull request #246359 from wegank/freefilesync-bump
freefilesync: 12.4 -> 12.5
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/networking/freefilesync/default.nix | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/pkgs/applications/networking/freefilesync/default.nix b/pkgs/applications/networking/freefilesync/default.nix index 8ce157c6d5730..63c674c1a0cea 100644 --- a/pkgs/applications/networking/freefilesync/default.nix +++ b/pkgs/applications/networking/freefilesync/default.nix @@ -17,11 +17,16 @@ stdenv.mkDerivation rec { pname = "freefilesync"; - version = "12.4"; + version = "12.5"; src = fetchurl { url = "https://freefilesync.org/download/FreeFileSync_${version}_Source.zip"; - hash = "sha256-rH1xp0/ggWWyUPcksY2GhYtUddTGrEDxdL/uODurvDo="; + # The URL only redirects to the file on the second attempt + postFetch = '' + rm -f $out + tryDownload "$url" + ''; + hash = "sha256-KTN/HbNLP/+z5rryp3wDRo6c7l03vi6tUxCXZPMGUoM="; }; sourceRoot = "."; @@ -31,8 +36,12 @@ stdenv.mkDerivation rec { # Disable loading of the missing Animal.dat (fetchpatch { url = "https://sources.debian.org/data/main/f/freefilesync/12.0-2/debian/patches/ffs_devuan.patch"; + postFetch = '' + substituteInPlace $out \ + --replace "-std=c++2b" "-std=c++23" + ''; excludes = [ "FreeFileSync/Source/ffs_paths.cpp" ]; - hash = "sha256-6pHr5txabMTpGMKP7I5oe1lGAmgb0cPW8ZkPv/WXN74="; + hash = "sha256-CtUC94AoYTxoqSMWZrzuO3jTD46rj11JnbNyXtWckCo="; }) # Fix build with GTK 3 (fetchpatch { |