diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2017-03-10 19:39:40 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2017-03-10 19:39:40 +0200 |
| commit | c863aa384e1a6237380afffd0feaf28b48983a23 (patch) | |
| tree | 7303c7538a9c941d2ed81b279072da4b2c7af003 /pkgs/applications/audio | |
| parent | 35f9f63a39f24f8b7e68451d5860a74260b4e5f8 (diff) | |
| download | nixpkgs-c863aa384e1a6237380afffd0feaf28b48983a23.tar nixpkgs-c863aa384e1a6237380afffd0feaf28b48983a23.tar.gz nixpkgs-c863aa384e1a6237380afffd0feaf28b48983a23.tar.bz2 nixpkgs-c863aa384e1a6237380afffd0feaf28b48983a23.tar.lz nixpkgs-c863aa384e1a6237380afffd0feaf28b48983a23.tar.xz nixpkgs-c863aa384e1a6237380afffd0feaf28b48983a23.tar.zst nixpkgs-c863aa384e1a6237380afffd0feaf28b48983a23.zip | |
cdparanoia: Fix aarch64 build
Hooray for autohelltools actually reducing portability!
Diffstat (limited to 'pkgs/applications/audio')
| -rw-r--r-- | pkgs/applications/audio/cdparanoia/default.nix | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/pkgs/applications/audio/cdparanoia/default.nix b/pkgs/applications/audio/cdparanoia/default.nix index ac5db3d1f63..34dba5e206f 100644 --- a/pkgs/applications/audio/cdparanoia/default.nix +++ b/pkgs/applications/audio/cdparanoia/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, IOKit, Carbon }: +{ stdenv, fetchurl, autoreconfHook, gnu-config, IOKit, Carbon }: stdenv.mkDerivation rec { name = "cdparanoia-III-10.2"; @@ -8,10 +8,6 @@ stdenv.mkDerivation rec { sha256 = "1pv4zrajm46za0f6lv162iqffih57a8ly4pc69f7y0gfyigb8p80"; }; - hardeningDisable = [ "format" ]; - - preConfigure = "unset CC"; - patches = stdenv.lib.optionals stdenv.isDarwin [ (fetchurl { url = "https://trac.macports.org/export/70964/trunk/dports/audio/cdparanoia/files/osx_interface.patch"; @@ -23,11 +19,20 @@ stdenv.mkDerivation rec { }) ]; + buildInputs = stdenv.lib.optional stdenv.isAarch64 autoreconfHook; + propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ Carbon IOKit ]; + hardeningDisable = [ "format" ]; + + preConfigure = "unset CC" + stdenv.lib.optionalString stdenv.isAarch64 ''\n + cp ${gnu-config}/config.sub configure.sub + cp ${gnu-config}/config.guess configure.guess + ''; + meta = { homepage = http://xiph.org/paranoia; description = "A tool and library for reading digital audio from CDs"; |