diff --git a/pkgs/by-name/ep/epsonscan2/gcc14.patch b/pkgs/by-name/ep/epsonscan2/gcc14.patch new file mode 100644 index 000000000000..803977574d0a --- /dev/null +++ b/pkgs/by-name/ep/epsonscan2/gcc14.patch @@ -0,0 +1,37 @@ +diff --git a/thirdparty/zlib/gzlib.c b/thirdparty/zlib/gzlib.c +index 4105e6a..eae3a38 100644 +--- a/thirdparty/zlib/gzlib.c ++++ b/thirdparty/zlib/gzlib.c +@@ -3,6 +3,7 @@ + * For conditions of distribution and use, see copyright notice in zlib.h + */ + ++#include + #include "gzguts.h" + + #if defined(_WIN32) && !defined(__BORLANDC__) && !defined(__MINGW32__) +diff --git a/thirdparty/zlib/gzread.c b/thirdparty/zlib/gzread.c +index 956b91e..66089b6 100644 +--- a/thirdparty/zlib/gzread.c ++++ b/thirdparty/zlib/gzread.c +@@ -3,6 +3,7 @@ + * For conditions of distribution and use, see copyright notice in zlib.h + */ + ++#include + #include "gzguts.h" + + /* Local functions */ +diff --git a/thirdparty/zlib/gzwrite.c b/thirdparty/zlib/gzwrite.c +index c7b5651..e685f3e 100644 +--- a/thirdparty/zlib/gzwrite.c ++++ b/thirdparty/zlib/gzwrite.c +@@ -3,6 +3,7 @@ + * For conditions of distribution and use, see copyright notice in zlib.h + */ + ++#include + #include "gzguts.h" + + /* Local functions */ + \ No newline at end of file diff --git a/pkgs/by-name/ep/epsonscan2/package.nix b/pkgs/by-name/ep/epsonscan2/package.nix index 9a9320fc9431..e94bc1f90bd6 100644 --- a/pkgs/by-name/ep/epsonscan2/package.nix +++ b/pkgs/by-name/ep/epsonscan2/package.nix @@ -49,16 +49,17 @@ stdenv.mkDerivation { patches = [ ./build.patch + ./gcc14.patch (fetchpatch { - url = "https://raw.githubusercontent.com/flathub/net.epson.epsonscan2/master/patches/0002-Fix-crash.patch"; + url = "https://raw.githubusercontent.com/flathub/net.epson.epsonscan2/a489ac2f8cbd03afeda86673930cc17663c31a53/patches/0002-Fix-crash.patch"; hash = "sha256-rNsFnHq//CJcIZl0M6RLRkIY3YhnJZbikO8SeeC2ktg="; }) (fetchpatch { - url = "https://raw.githubusercontent.com/flathub/net.epson.epsonscan2/master/patches/0004-Fix-a-crash-on-an-OOB-container-access.patch"; + url = "https://raw.githubusercontent.com/flathub/net.epson.epsonscan2/a489ac2f8cbd03afeda86673930cc17663c31a53/patches/0004-Fix-a-crash-on-an-OOB-container-access.patch"; hash = "sha256-WmA8pmPSJ1xUdeBbE8Jzi6w9p96aIOm0erF3T4EQ6VA="; }) (fetchpatch { - url = "https://raw.githubusercontent.com/flathub/net.epson.epsonscan2/master/patches/0003-Use-XDG-open-to-open-the-directory.patch"; + url = "https://raw.githubusercontent.com/flathub/net.epson.epsonscan2/a489ac2f8cbd03afeda86673930cc17663c31a53/patches/0003-Use-XDG-open-to-open-the-directory.patch"; hash = "sha256-H3lle1SXkkpbBkozYEwiX0z9oTUubTpB+l91utxH03M="; }) ];