diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-05-18 08:17:48 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-05-18 08:17:48 +0200 |
| commit | 840e530934eb24f83788bb0933e304500ea0dc01 (patch) | |
| tree | b330ddaaaa66808ffe137eef0f48ce080d08bda9 /pkgs/applications/audio | |
| parent | 365c82c4bb80585d827ecde76b105075aba94040 (diff) | |
| parent | 2de2bc4be10637a7d8b11d40731954034ae3be57 (diff) | |
| download | nixlib-840e530934eb24f83788bb0933e304500ea0dc01.tar nixlib-840e530934eb24f83788bb0933e304500ea0dc01.tar.gz nixlib-840e530934eb24f83788bb0933e304500ea0dc01.tar.bz2 nixlib-840e530934eb24f83788bb0933e304500ea0dc01.tar.lz nixlib-840e530934eb24f83788bb0933e304500ea0dc01.tar.xz nixlib-840e530934eb24f83788bb0933e304500ea0dc01.tar.zst nixlib-840e530934eb24f83788bb0933e304500ea0dc01.zip | |
Merge staging into staging-next
Diffstat (limited to 'pkgs/applications/audio')
| -rw-r--r-- | pkgs/applications/audio/cdparanoia/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/audio/cdparanoia/default.nix b/pkgs/applications/audio/cdparanoia/default.nix index c419d141d1ba..4e517ee636e8 100644 --- a/pkgs/applications/audio/cdparanoia/default.nix +++ b/pkgs/applications/audio/cdparanoia/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./utils.patch ++ [./fix_private_keyword.patch]; - buildInputs = stdenv.lib.optional stdenv.isAarch64 autoreconfHook; + nativeBuildInputs = stdenv.lib.optional stdenv.isAarch64 autoreconfHook; propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ Carbon @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - preConfigure = "unset CC" + stdenv.lib.optionalString stdenv.isAarch64 ''\n + preConfigure = "unset CC" + stdenv.lib.optionalString stdenv.isAarch64 ''; cp ${gnu-config}/config.sub configure.sub cp ${gnu-config}/config.guess configure.guess ''; |