diff options
| author | Emily <vcs@emily.moe> | 2023-08-02 04:04:42 +0100 |
|---|---|---|
| committer | Emily <vcs@emily.moe> | 2023-08-02 04:05:03 +0100 |
| commit | 58dff2378fec180a2d273bccfe10a6423fafcba5 (patch) | |
| tree | 14e237100f5a7baf6d32b88cdade21a4d87af09a /pkgs | |
| parent | 13e2cb64cfc4236c6b0f11076636b471d97ac0b0 (diff) | |
| download | nixpkgs-58dff2378fec180a2d273bccfe10a6423fafcba5.tar nixpkgs-58dff2378fec180a2d273bccfe10a6423fafcba5.tar.gz nixpkgs-58dff2378fec180a2d273bccfe10a6423fafcba5.tar.bz2 nixpkgs-58dff2378fec180a2d273bccfe10a6423fafcba5.tar.lz nixpkgs-58dff2378fec180a2d273bccfe10a6423fafcba5.tar.xz nixpkgs-58dff2378fec180a2d273bccfe10a6423fafcba5.tar.zst nixpkgs-58dff2378fec180a2d273bccfe10a6423fafcba5.zip | |
{cdrdao,whipper}: support Darwin
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/audio/whipper/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/cd-dvd/cdrdao/default.nix | 19 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
3 files changed, 22 insertions, 3 deletions
diff --git a/pkgs/applications/audio/whipper/default.nix b/pkgs/applications/audio/whipper/default.nix index e92b2f13187..eb179bfa549 100644 --- a/pkgs/applications/audio/whipper/default.nix +++ b/pkgs/applications/audio/whipper/default.nix @@ -95,6 +95,6 @@ in python3.pkgs.buildPythonApplication rec { description = "A CD ripper aiming for accuracy over speed"; maintainers = with maintainers; [ emily ]; license = licenses.gpl3Plus; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/cd-dvd/cdrdao/default.nix b/pkgs/tools/cd-dvd/cdrdao/default.nix index a58754c0370..8d557993f9d 100644 --- a/pkgs/tools/cd-dvd/cdrdao/default.nix +++ b/pkgs/tools/cd-dvd/cdrdao/default.nix @@ -2,10 +2,14 @@ lib, stdenv, fetchurl, + fetchpatch, pkg-config, + libiconv, libvorbis, libmad, libao, + CoreServices, + IOKit, }: stdenv.mkDerivation (finalAttrs: { @@ -24,13 +28,26 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ + libiconv libvorbis libmad libao + ] ++ lib.optionals stdenv.isDarwin [ + CoreServices + IOKit ]; hardeningDisable = [ "format" ]; + patches = [ + # Fix build on macOS SDK < 12 + # https://github.com/cdrdao/cdrdao/pull/19 + (fetchpatch { + url = "https://github.com/cdrdao/cdrdao/commit/105d72a61f510e3c47626476f9bbc9516f824ede.patch"; + hash = "sha256-NVIw59CSrc/HcslhfbYQNK/qSmD4QbfuV8hWYhWelX4="; + }) + ]; + # we have glibc/include/linux as a symlink to the kernel headers, # and the magic '..' points to kernelheaders, and not back to the glibc/include postPatch = '' @@ -43,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "A tool for recording audio or data CD-Rs in disk-at-once (DAO) mode"; homepage = "https://cdrdao.sourceforge.net/"; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; license = lib.licenses.gpl2; }; }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2a9362c02dc..1ec575b69bf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6547,7 +6547,9 @@ with pkgs; cdpr = callPackage ../tools/networking/cdpr { }; - cdrdao = callPackage ../tools/cd-dvd/cdrdao { }; + cdrdao = callPackage ../tools/cd-dvd/cdrdao { + inherit (darwin.apple_sdk.frameworks) CoreServices IOKit; + }; cdrkit = callPackage ../tools/cd-dvd/cdrkit { }; |