Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[staging] cdparanoia: cleanup, fix build on powerpc #106413

Merged
merged 1 commit into from
Jun 16, 2021
Merged

[staging] cdparanoia: cleanup, fix build on powerpc #106413

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions pkgs/applications/audio/cdparanoia/default.nix
View file
Open in desktop
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