diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2022-05-07 17:54:05 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2022-05-07 17:55:19 -0400 |
| commit | 850c9fea3e9e0f572f80e8eb1df2e325c21cf43d (patch) | |
| tree | 3cd71d28ad3c7d00cff5e05a84b85ffb2bd33eff /pkgs/applications/audio/cdparanoia | |
| parent | 8a00f0ca38b0c841f5d7a55bca4280bf0b46a96c (diff) | |
cdparanoiaIII: Fix Darwin build after #171046
I shouldn't have been so hasty rearranging things, and also should have tested Darwin before merging! Sorry @vcunat!
Diffstat (limited to 'pkgs/applications/audio/cdparanoia')
| -rw-r--r-- | pkgs/applications/audio/cdparanoia/default.nix | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/pkgs/applications/audio/cdparanoia/default.nix b/pkgs/applications/audio/cdparanoia/default.nix index 2c13631624e77..7f699b82aefc8 100644 --- a/pkgs/applications/audio/cdparanoia/default.nix +++ b/pkgs/applications/audio/cdparanoia/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl +{ lib, stdenv, fetchurl, fetchpatch , updateAutotoolsGnuConfigScriptsHook, autoreconfHook , IOKit, Carbon }: @@ -12,18 +12,24 @@ stdenv.mkDerivation rec { sha256 = "1pv4zrajm46za0f6lv162iqffih57a8ly4pc69f7y0gfyigb8p80"; }; - patches = [ - ./fix_private_keyword.patch - ./configure.patch - ] ++ lib.optionals stdenv.isDarwin [ - (fetchurl { + patches = lib.optionals stdenv.isDarwin [ + (fetchpatch { url = "https://trac.macports.org/export/70964/trunk/dports/audio/cdparanoia/files/osx_interface.patch"; - sha256 = "1n86kzm2ssl8fdf5wlhp6ncb2bf6b9xlb5vg0mhc85r69prqzjiy"; + sha256 = "0hq3lvfr0h1m3p0r33jij0s1aspiqlpy533rwv19zrfllb39qvr8"; + # Our configure patch will subsume it, but we want our configure + # patch to be used on all platforms so we cannot just start where + # this leaves off. + excludes = [ "configure.in" ]; }) (fetchurl { url = "https://trac.macports.org/export/70964/trunk/dports/audio/cdparanoia/files/patch-paranoia_paranoia.c.10.4.diff"; sha256 = "17l2qhn8sh4jy6ryy5si6ll6dndcm0r537rlmk4a6a8vkn852vad"; }) + ] ++ [ + # Has to come after darwin patches + ./fix_private_keyword.patch + # Order does not matter + ./configure.patch ] ++ lib.optional stdenv.hostPlatform.isMusl ./utils.patch; nativeBuildInputs = [ |