diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-11-10 09:39:32 +0100 |
|---|---|---|
| committer | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-11-10 09:39:32 +0100 |
| commit | a38b57a3adfe2f088a5b9af472748a6ce67b78c6 (patch) | |
| tree | 163269b9601ff0caa14f151b2806e2a2c3f71d0e | |
| parent | 3f616fad02c82853a8e6e3cf8fd3aea95945f70e (diff) | |
| download | nixpkgs-a38b57a3adfe2f088a5b9af472748a6ce67b78c6.tar nixpkgs-a38b57a3adfe2f088a5b9af472748a6ce67b78c6.tar.gz nixpkgs-a38b57a3adfe2f088a5b9af472748a6ce67b78c6.tar.bz2 nixpkgs-a38b57a3adfe2f088a5b9af472748a6ce67b78c6.tar.lz nixpkgs-a38b57a3adfe2f088a5b9af472748a6ce67b78c6.tar.xz nixpkgs-a38b57a3adfe2f088a5b9af472748a6ce67b78c6.tar.zst nixpkgs-a38b57a3adfe2f088a5b9af472748a6ce67b78c6.zip | |
cdrkit: fix build with clang 16
| -rw-r--r-- | pkgs/tools/cd-dvd/cdrkit/default.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/tools/cd-dvd/cdrkit/default.nix b/pkgs/tools/cd-dvd/cdrkit/default.nix index de54827071c..402e6f4dde3 100644 --- a/pkgs/tools/cd-dvd/cdrkit/default.nix +++ b/pkgs/tools/cd-dvd/cdrkit/default.nix @@ -15,7 +15,12 @@ stdenv.mkDerivation rec { lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Carbon IOKit iconv ]); hardeningDisable = [ "format" ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isMusl "-D__THROW="; + 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 ]; |