From 9f884250025784daaab7f3aa6aac745d14a4b7e8 Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Tue, 8 Dec 2020 19:25:41 -0800 Subject: cdparanoia: fix build on powerpc 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. --- pkgs/applications/audio/cdparanoia/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/applications/audio') diff --git a/pkgs/applications/audio/cdparanoia/default.nix b/pkgs/applications/audio/cdparanoia/default.nix index 29359b097d2f..11c141e9c552 100644 --- a/pkgs/applications/audio/cdparanoia/default.nix +++ b/pkgs/applications/audio/cdparanoia/default.nix @@ -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"; @@ -20,8 +20,6 @@ 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 @@ -29,7 +27,9 @@ stdenv.mkDerivation rec { 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 ''; -- cgit 1.4.1