Skip to content

Commit

Permalink
cdparanoia: fix build on powerpc
Browse files Browse the repository at this point in the history
The configure helpers are old and already need to be updated on aarch64,
so let's just do this on all non-x86 platforms. This will probably fix
other architectures that weren't well-supported at the time.

The autoreconfHook does not appear to be needed on aarch64 or powerpc.
  • Loading branch information
r-burns committed Feb 9, 2021
1 parent c010b09 commit 9f88425
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions pkgs/applications/audio/cdparanoia/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, autoreconfHook, gnu-config, IOKit, Carbon }:
{ lib, stdenv, fetchurl, gnu-config, IOKit, Carbon }:

stdenv.mkDerivation rec {
name = "cdparanoia-III-10.2";
Expand All @@ -20,16 +20,16 @@ stdenv.mkDerivation rec {
] ++ lib.optional stdenv.hostPlatform.isMusl ./utils.patch
++ [./fix_private_keyword.patch];

nativeBuildInputs = lib.optional stdenv.isAarch64 autoreconfHook;

propagatedBuildInputs = lib.optionals stdenv.isDarwin [
Carbon
IOKit
];

hardeningDisable = [ "format" ];

preConfigure = "unset CC" + lib.optionalString stdenv.isAarch64 '';
preConfigure = ''
unset CC
'' + lib.optionalString (!stdenv.hostPlatform.isx86) ''
cp ${gnu-config}/config.sub configure.sub
cp ${gnu-config}/config.guess configure.guess
'';
Expand Down

0 comments on commit 9f88425

Please sign in to comment.