Skip to content

various: fix build with GCC 14 #357774

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
emilazy merged 7 commits into from
Nov 25, 2024
Merged

various: fix build with GCC 14 #357774

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
54601fd
python312Packages.shapely: fix build with GCC 14
FliegendeWurst Nov 21, 2024
57f6fd6
python312Packages.xmlsec: fix build with GCC 14
FliegendeWurst Nov 21, 2024
c4f27b6
cdrtools: fix build with GCC 14
FliegendeWurst Nov 21, 2024
11787cb
cdrkit: move to debian source, apply debian patches
FliegendeWurst Nov 21, 2024
f75b34c
freerdp: fix build with GCC 14
FliegendeWurst Nov 21, 2024
6dcdf8a
perlPackages.DBDmysql: 4.050 -> 5.010
FliegendeWurst Nov 24, 2024
9f6ea15
mariadb-server: use DBDMariaDB insteady of mysql
FliegendeWurst Nov 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions pkgs/applications/networking/remote/freerdp/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
, alsa-lib
, faac
, faad2
, fetchpatch
, ffmpeg
, glib
, openh264
Expand Down Expand Up @@ -85,6 +86,22 @@ stdenv.mkDerivation rec {
hash = "sha256-w+xyMNFmKylSheK0yAGl8J6MXly/HUjjAfR9Qq3s/kA=";
};

patches = [
# GCC 14 compatibility
(fetchpatch {
url = "https://github.com/FreeRDP/FreeRDP/commit/5b14b7cbdd36414f1838047f21502654bd32ebb1.patch";
hash = "sha256-EWLfmjGJGWA/sY2E2DnFKhPbzhOVbXZPCrV8i1XuSeY=";
})
(fetchpatch {
url = "https://github.com/FreeRDP/FreeRDP/commit/efa899d3deb8595a29fabb2a2251722f9d7e0d7f.patch";
hash = "sha256-hjqNexYq+3iO2L2L9wT2tWbHz0BEtl/y7jgQT4kpNIM=";
})
(fetchpatch {
url = "https://github.com/FreeRDP/FreeRDP/commit/0c20fac8f1deeeca3df93a6619542e5d9176f0f0.patch";
hash = "sha256-cEzNPteucoI5KoGEM3C6mg2kW9uWImPebZEV6nssexY=";
})
];

postPatch = ''
export HOME=$TMP

Expand Down
11 changes: 0 additions & 11 deletions pkgs/by-name/cd/cdrkit/cdrkit-1.1.11-fno-common.patch
View file
Open in desktop

This file was deleted.

204 changes: 0 additions & 204 deletions pkgs/by-name/cd/cdrkit/cdrkit-1.1.9-efi-boot.patch
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions pkgs/by-name/cd/cdrkit/include-path.patch
View file
Open in desktop

This file was deleted.

28 changes: 14 additions & 14 deletions pkgs/by-name/cd/cdrkit/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
{lib, stdenv, fetchurl, cmake, libcap, zlib, bzip2, perl}:
{lib, stdenv, fetchFromGitLab, cmake, libcap, zlib, bzip2, perl, quilt}:

stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "cdrkit";
version = "1.1.11";
version = "1.1.11-3.5";

src = fetchurl {
url = "http://cdrkit.org/releases/cdrkit-${version}.tar.gz";
sha256 = "1nj7iv3xrq600i37na9a5idd718piiiqbs4zxvpjs66cdrsk1h6i";
src = fetchFromGitLab {
domain = "salsa.debian.org";
owner = "debian";
repo = "cdrkit";
rev = "debian/9%${finalAttrs.version}";
hash = "sha256-T7WhztbpVvGegF6rTHGTkEALq+mcAtTerzDQ3f6Cq78=";
};

nativeBuildInputs = [ cmake ];
nativeBuildInputs = [ cmake quilt ];
buildInputs = [ zlib bzip2 perl ] ++
lib.optionals stdenv.hostPlatform.isLinux [ libcap ];

hardeningDisable = [ "format" ];
env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.hostPlatform.isMusl [
"-D__THROW="
] ++ lib.optionals stdenv.cc.isClang [
"-Wno-error=int-conversion"
"-Wno-error=implicit-function-declaration"
]);

# efi-boot-patch extracted from http://arm.koji.fedoraproject.org/koji/rpminfo?rpmID=174244
patches = [ ./include-path.patch ./cdrkit-1.1.9-efi-boot.patch ./cdrkit-1.1.11-fno-common.patch ];

postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
postPatch = ''
QUILT_PATCHES=debian/patches quilt push -a
'' + lib.optionalString stdenv.hostPlatform.isDarwin ''
substituteInPlace libusal/scsi-mac-iokit.c \
--replace "IOKit/scsi-commands/SCSITaskLib.h" "IOKit/scsi/SCSITaskLib.h"
substituteInPlace genisoimage/sha256.c \
Expand Down Expand Up @@ -75,4 +75,4 @@ stdenv.mkDerivation rec {
license = lib.licenses.gpl2Plus;
platforms = lib.platforms.unix;
};
}
})
9 changes: 9 additions & 0 deletions pkgs/development/python-modules/shapely/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
stdenv,
buildPythonPackage,
fetchPypi,
fetchpatch,
pytestCheckHook,
pythonOlder,

Expand All @@ -26,6 +27,14 @@ buildPythonPackage rec {
hash = "sha256-mX9hWbFIQFnsI5ysqlNGf9i1Vk2r4YbNhKwpRGY7C/Y=";
};

patches = [
# fixes build error with GCC 14
(fetchpatch {
url = "https://github.com/shapely/shapely/commit/05455886750680728dc751dc5888cd02086d908e.patch";
hash = "sha256-YnmiWFfjHHFZCxrmabBINM4phqfLQ+6xEc30EoV5d98=";
})
];

nativeBuildInputs = [
cython_0
geos # for geos-config
Expand Down
9 changes: 9 additions & 0 deletions pkgs/development/python-modules/xmlsec/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
lib,
fetchPypi,
fetchpatch,
buildPythonPackage,
pytestCheckHook,
libxslt,
Expand All @@ -24,6 +25,14 @@ buildPythonPackage rec {
hash = "sha256-k0+ATy+JW824bx6u4ja2YQE1YO5p7BCNKc3W5fKSotk=";
};

patches = [
# fixes build error with GCC 14
(fetchpatch {
url = "https://github.com/xmlsec/python-xmlsec/commit/67cd4ac73e4fceac4b4eb6a320067cad33f79213.patch";
hash = "sha256-zU34a2x3S48Hwvo/oDe5mfkZ3jBwdajIrKwKhTRSsko=";
})
];

nativeBuildInputs = [
pkg-config
pkgconfig
Expand Down
2 changes: 1 addition & 1 deletion pkgs/servers/sql/mariadb/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ let

libExt = stdenv.hostPlatform.extensions.sharedLibrary;

mytopEnv = buildPackages.perl.withPackages (p: with p; [ DBDmysql DBI TermReadKey ]);
mytopEnv = buildPackages.perl.withPackages (p: with p; [ DBDMariaDB DBI TermReadKey ]);

common = rec { # attributes common to both builds
inherit version;
Expand Down
5 changes: 5 additions & 0 deletions pkgs/tools/cd-dvd/cdrtools/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ m4 ];
buildInputs = if stdenv.hostPlatform.isDarwin then [ Carbon IOKit ] else [ acl libcap ];

env.CFLAGS = toString [
"-Wno-error=implicit-int"
"-Wno-error=implicit-function-declaration"
];
Comment on lines +15 to +18
Copy link
Member

@emilazy emilazy Nov 24, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Non‐blocking nit: lib.concatStringsSep " " has less surprising behaviour in general (but they are equivalent in this case).


postPatch = ''
sed "/\.mk3/d" -i libschily/Targets.man
substituteInPlace man/Makefile --replace "man4" ""
Expand Down
Loading