Skip to content

Commit 0312965

Browse files
xsane: fix build failure (NixOS#370637)
2 parents 1b5c3ad + 2715ad4 commit 0312965

File tree

1 file changed

+81
-6
lines changed

1 file changed

+81
-6
lines changed

pkgs/applications/graphics/sane/xsane.nix

Lines changed: 81 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,87 @@ stdenv.mkDerivation rec {
2727
hash = "sha256-oOg94nUsT9LLKnHocY0S5g02Y9a1UazzZAjpEI/s+yM=";
2828
};
2929

30-
patches = [
31-
(fetchpatch {
32-
url = "https://src.fedoraproject.org/rpms/xsane/raw/rawhide/f/xsane-0.998-libpng.patch";
33-
hash = "sha256-0z292+Waa2g0PCQpUebdWprl9VDyBOY0XgqMJaIcRb8=";
34-
})
35-
];
30+
# add all fedora patchs. fix gcc-14 build among other things
31+
# https://src.fedoraproject.org/rpms/xsane/tree/main
32+
patches =
33+
let
34+
fetchFedoraPatch =
35+
{ name, hash }:
36+
fetchpatch {
37+
inherit name hash;
38+
url = "https://src.fedoraproject.org/rpms/xsane/raw/846ace0a29063335c708b01e9696eda062d7459c/f/${name}";
39+
};
40+
in
41+
map fetchFedoraPatch [
42+
{
43+
name = "0001-Follow-new-convention-for-registering-gimp-plugin.patch";
44+
hash = "sha256-yOY7URyc8HEHHynvdcZAV1Pri31N/rJ0ddPavOF5zLw=";
45+
}
46+
{
47+
name = "xsane-0.995-close-fds.patch";
48+
hash = "sha256-qE7larHpBEikz6OaOQmmi9jl6iQxy/QM7iDg9QrVV1o=";
49+
}
50+
{
51+
name = "xsane-0.995-xdg-open.patch";
52+
hash = "sha256-/kHwwuDC2naGEp4NALfaJ0pJe+9kYhV4TX1eGeARvq8=";
53+
}
54+
{
55+
name = "xsane-0.996-no-eula.patch";
56+
hash = "sha256-CYmp1zFg11PUPz9um2W7XF6pzCzafKSEn2nvPiUSxNo=";
57+
}
58+
{
59+
name = "xsane-0.997-ipv6.patch";
60+
hash = "sha256-D3xH++DHxyTKMxgatU+PNCVN1u5ajPc3gQxvzhMYIdM=";
61+
}
62+
{
63+
name = "xsane-0.997-off-root-build.patch";
64+
hash = "sha256-2LXQfMbvqP+TAhAmxRe6pBqNlSX4tVjhDkBHIfX9HcA=";
65+
}
66+
{
67+
name = "xsane-0.998-desktop-file.patch";
68+
hash = "sha256-3xEj6IaOk/FS8pv+/yaNjZpIoB+0Oei0QB9mD4/owkM=";
69+
}
70+
{
71+
name = "xsane-0.998-libpng.patch";
72+
hash = "sha256-0z292+Waa2g0PCQpUebdWprl9VDyBOY0XgqMJaIcRb8=";
73+
}
74+
{
75+
name = "xsane-0.998-preview-selection.patch";
76+
hash = "sha256-TZ8vRA+0qPY2Rqz0VNHjgkj3YPob/BW+zBoVqxnUhb8=";
77+
}
78+
{
79+
name = "xsane-0.998-wmclass.patch";
80+
hash = "sha256-RubFOs+hsZS+GdxF0yvLSy4v+Fi6vb9G6zfwWZcUlkY=";
81+
}
82+
{
83+
name = "xsane-0.999-lcms2.patch";
84+
hash = "sha256-eiAxa1lhFrinqBvlIhH+NP7WBKk0Plf2S+OVTcpxXac=";
85+
}
86+
{
87+
name = "xsane-0.999-man-page.patch";
88+
hash = "sha256-4g0w4x9boAIOA6s5eTzKMh2mkkRKtF1TZ9KgHNTDaAg=";
89+
}
90+
{
91+
name = "xsane-0.999-no-file-selected.patch";
92+
hash = "sha256-e/QKtvsIwU5yy0SJKAEAmhmCoxWqV6FHmAW41SbW/eI=";
93+
}
94+
{
95+
name = "xsane-0.999-pdf-no-high-bpp.patch";
96+
hash = "sha256-o3LmOvgERuB9CQ8RL2Nd40h1ePuuuGMSK1GN68QlJ6s=";
97+
}
98+
{
99+
name = "xsane-0.999-signal-handling.patch";
100+
hash = "sha256-JU9BJ6UIDa1FsuPaQKsxcjxvsJkwgmuopIqCVWY3LQ0=";
101+
}
102+
{
103+
name = "xsane-0.999-snprintf-update.patch";
104+
hash = "sha256-bSTeoIOLeJ4PEsBHR+ZUQLPmrc0D6aQzyJGlLVhXt8o=";
105+
}
106+
{
107+
name = "xsane-configure-c99.patch";
108+
hash = "sha256-ukaNGgzCGiQwbOzSguAqBIKOUzXofSC3lct812U/8gY=";
109+
}
110+
];
36111

37112
preConfigure = ''
38113
sed -e '/SANE_CAP_ALWAYS_SETTABLE/d' -i src/xsane-back-gtk.c

0 commit comments

Comments
 (0)