nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-24 21:14:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

freefilesync: 13.2 -> 13.3

Browse Source
This commit is contained in:
Weijia Wang 2024-01-10 22:44:50 +01:00
parent d5304c2bd0
commit 352212ba1e
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
pkgs/applications/networking/freefilesync/default.nix
View File

@ -2,6 +2,7 @@
, stdenv , stdenv
, fetchurl , fetchurl
, fetchpatch , fetchpatch
, fetchDebianPatch
, copyDesktopItems , copyDesktopItems
, pkg-config , pkg-config
, wrapGAppsHook , wrapGAppsHook
@ -15,16 +16,9 @@
, makeDesktopItem , makeDesktopItem
}: }:
let
wxGTK32' = wxGTK32.overrideAttrs (old: {
configureFlags = old.configureFlags ++ [
"--disable-exceptions"
];
});
in
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "freefilesync"; pname = "freefilesync";
version = "13.2"; version = "13.3";
src = fetchurl { src = fetchurl {
url = "https://freefilesync.org/download/FreeFileSync_${finalAttrs.version}_Source.zip"; url = "https://freefilesync.org/download/FreeFileSync_${finalAttrs.version}_Source.zip";
@ -33,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
rm -f $out rm -f $out
tryDownload "$url" tryDownload "$url"
''; '';
hash = "sha256-Hb3DkHdINtg5vNs6IcCHKxgSiN5u/2kY8V8Fnq5yFCM="; hash = "sha256-mpCCecG1teBjIJqCzB3pGAQKT6t8bMKbK8KihMXOn3g=";
}; };
sourceRoot = "."; sourceRoot = ".";
@ -42,20 +36,26 @@ stdenv.mkDerivation (finalAttrs: {
patches = [ patches = [
# Disable loading of the missing Animal.dat # Disable loading of the missing Animal.dat
(fetchpatch { (fetchpatch {
url = "https://sources.debian.org/data/main/f/freefilesync/12.0-2/debian/patches/ffs_devuan.patch"; url = "https://sources.debian.org/data/main/f/freefilesync/13.3-1/debian/patches/ffs_devuan.patch";
postFetch = ''
substituteInPlace $out \
--replace "-std=c++2b" "-std=c++23" \
--replace "imageWidth," "wxsizeToScreen(imageWidth),"
'';
excludes = [ "FreeFileSync/Source/ffs_paths.cpp" ]; excludes = [ "FreeFileSync/Source/ffs_paths.cpp" ];
hash = "sha256-LH549fJWGpJ0p6/0YNda1zZHGs/QRl1CYLC/vYKdkO4="; hash = "sha256-cW0Y9+ByQWGzMU4NFRSkW46KkxQB4jRZotHlCFniv5o=";
}) })
# Fix build with GTK 3 # Fix build with GTK 3
(fetchpatch { (fetchDebianPatch {
url = "https://sources.debian.org/data/main/f/freefilesync/12.0-2/debian/patches/ffs_devuan_gtk3.patch"; pname = "freefilesync";
version = "13.3";
debianRevision = "1";
patch = "ffs_devuan_gtk3.patch";
hash = "sha256-0n58Np4JI3hYK/CRBytkPHl9Jp4xK+IRjgUvoYti/f4="; hash = "sha256-0n58Np4JI3hYK/CRBytkPHl9Jp4xK+IRjgUvoYti/f4=";
}) })
# Fix build with vanilla wxWidgets
(fetchDebianPatch {
pname = "freefilesync";
version = "13.3";
debianRevision = "1";
patch = "Disable_wxWidgets_uncaught_exception_handling.patch";
hash = "sha256-Fem7eDDKSqPFU/t12Jco8OmYC8FM9JgB4/QVy/ouvbI=";
})
]; ];
nativeBuildInputs = [ nativeBuildInputs = [
@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: {
gtk3 gtk3
libssh2 libssh2
openssl openssl
wxGTK32' wxGTK32
]; ];
env.NIX_CFLAGS_COMPILE = toString [ env.NIX_CFLAGS_COMPILE = toString [