swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 12:59:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #106413 from r-burns/cdparanoia

Browse source 
[staging] cdparanoia: cleanup, fix build on powerpc
This commit is contained in:
Martin Weinelt 2021-06-16 22:13:43 +02:00 committed by GitHub
parent a57991638f 9f88425002
commit ee31040021
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/applications/audio/cdparanoia/default.nix
View file

@ -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
'';