cdrtools: unpin llvmPackages_14 (#420515)

Changed files
+12 -7
pkgs
tools
cd-dvd
cdrtools
top-level
+11 -4
pkgs/tools/cd-dvd/cdrtools/default.nix
···
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
···
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
pkgs/top-level/all-packages.nix
···
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 { };