cdrtools: unpin llvmPackages_14 (#420515)

This commit is contained in:
Weijia Wang
2025-07-03 00:19:16 +02:00
committed by GitHub
2 changed files with 12 additions and 7 deletions
+11 -4
View File
@@ -22,10 +22,16 @@ stdenv.mkDerivation rec {
libcap
];
env.CFLAGS = toString [
"-Wno-error=implicit-int"
"-Wno-error=implicit-function-declaration"
];
env.NIX_CFLAGS_COMPILE = toString (
[
"-Wno-error=implicit-int"
"-Wno-error=implicit-function-declaration"
]
# https://github.com/macports/macports-ports/commit/656932616eebe60f4e8cfd96d8268801dad8224d
++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
"-DNO_SCANSTACK"
]
);
postPatch = ''
sed "/\.mk3/d" -i libschily/Targets.man
@@ -59,6 +65,7 @@ stdenv.mkDerivation rec {
gpl2Plus
lgpl21
];
maintainers = with maintainers; [ wegank ];
platforms = with platforms; linux ++ darwin;
# Licensing issues: This package contains code licensed under CDDL, GPL2
# and LGPL2. There is a debate regarding the legality of distributing this
+1 -3
View File
@@ -2489,9 +2489,7 @@ with pkgs;
cdist = python3Packages.callPackage ../tools/admin/cdist { };
cdrtools = callPackage ../tools/cd-dvd/cdrtools {
stdenv = if stdenv.hostPlatform.isDarwin then llvmPackages_14.stdenv else stdenv;
};
cdrtools = callPackage ../tools/cd-dvd/cdrtools { };
cemu-ti = qt5.callPackage ../applications/science/math/cemu-ti { };