diff options
| author | Martin Weinelt <mweinelt@users.noreply.github.com> | 2021-06-16 22:13:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-16 22:13:43 +0200 |
| commit | ee3104002198db8fccbd6fc490ccaa6a8ae454b2 (patch) | |
| tree | 3dfd67e309ddc3728ec264cabc9f3cf0821295b1 /pkgs/applications/audio | |
| parent | a57991638f6113434025e3d563c7a092a7d2b50c (diff) | |
| parent | 9f884250025784daaab7f3aa6aac745d14a4b7e8 (diff) | |
| download | nixlib-ee3104002198db8fccbd6fc490ccaa6a8ae454b2.tar nixlib-ee3104002198db8fccbd6fc490ccaa6a8ae454b2.tar.gz nixlib-ee3104002198db8fccbd6fc490ccaa6a8ae454b2.tar.bz2 nixlib-ee3104002198db8fccbd6fc490ccaa6a8ae454b2.tar.lz nixlib-ee3104002198db8fccbd6fc490ccaa6a8ae454b2.tar.xz nixlib-ee3104002198db8fccbd6fc490ccaa6a8ae454b2.tar.zst nixlib-ee3104002198db8fccbd6fc490ccaa6a8ae454b2.zip | |
Merge pull request #106413 from r-burns/cdparanoia
[staging] cdparanoia: cleanup, fix build on powerpc
Diffstat (limited to 'pkgs/applications/audio')
| -rw-r--r-- | pkgs/applications/audio/cdparanoia/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
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 ''; |