diff options
| author | Alyssa Ross <alyssa.ross@unikie.com> | 2022-12-02 10:21:44 +0000 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2022-12-02 23:11:23 +0000 |
| commit | 2c25878d0a4d677d6b9ec0bbb275158ab4d923b0 (patch) | |
| tree | 0c0c147a0429fc316d68f971bbb995623a15872e | |
| parent | Merge pull request #203817 from risicle/ris-mujs-CVE-2022-44789-r22.05 (diff) | |
| download | nixpkgs-origin/backport-204084-to-release-22.05.tar.gz | |
pkgsMusl.cdrkit: fix buildorigin/backport-204084-to-release-22.05
These are the same tricks that Alpine uses.
(cherry picked from commit 697d46e631fcb0e72bd06255dd91eaa5b671d27e)
| -rw-r--r-- | pkgs/tools/cd-dvd/cdrkit/default.nix | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/tools/cd-dvd/cdrkit/default.nix b/pkgs/tools/cd-dvd/cdrkit/default.nix index e28d4f8b9c7e..6f9c7a656d1b 100644 --- a/pkgs/tools/cd-dvd/cdrkit/default.nix +++ b/pkgs/tools/cd-dvd/cdrkit/default.nix @@ -13,10 +13,16 @@ stdenv.mkDerivation rec { buildInputs = [ libcap zlib bzip2 perl ]; hardeningDisable = [ "format" ]; + NIX_CFLAGS_COMPILE = lib.optional stdenv.hostPlatform.isMusl "-D__THROW="; # 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 ]; + preConfigure = lib.optionalString stdenv.hostPlatform.isMusl '' + substituteInPlace include/xconfig.h.in \ + --replace "#define HAVE_RCMD 1" "#undef HAVE_RCMD" + ''; + postInstall = '' # file name compatibility with the old cdrecord (growisofs wants this name) ln -s $out/bin/genisoimage $out/bin/mkisofs |