diff options
| author | taku0 <mxxouy6x3m_github@tatapa.org> | 2015-09-14 21:59:02 +0900 |
|---|---|---|
| committer | taku0 <mxxouy6x3m_github@tatapa.org> | 2015-09-16 21:10:19 +0900 |
| commit | a904293857f2e75a860721b601ebf1522ddc1ffa (patch) | |
| tree | 8f2f1b3883221efcc89a78da4377f3d3bfb4ffcf /pkgs/development | |
| parent | 4e1b9578d2566fb410ee6c675e6bf93e6d55eb17 (diff) | |
| download | nixlib-a904293857f2e75a860721b601ebf1522ddc1ffa.tar nixlib-a904293857f2e75a860721b601ebf1522ddc1ffa.tar.gz nixlib-a904293857f2e75a860721b601ebf1522ddc1ffa.tar.bz2 nixlib-a904293857f2e75a860721b601ebf1522ddc1ffa.tar.lz nixlib-a904293857f2e75a860721b601ebf1522ddc1ffa.tar.xz nixlib-a904293857f2e75a860721b601ebf1522ddc1ffa.tar.zst nixlib-a904293857f2e75a860721b601ebf1522ddc1ffa.zip | |
wavpack: disabled asm for Clang
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/libraries/wavpack/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/development/libraries/wavpack/wavpack_clang.patch | 25 |
2 files changed, 36 insertions, 1 deletions
diff --git a/pkgs/development/libraries/wavpack/default.nix b/pkgs/development/libraries/wavpack/default.nix index b205519eea17..074b26e3f3a5 100644 --- a/pkgs/development/libraries/wavpack/default.nix +++ b/pkgs/development/libraries/wavpack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "wavpack-${version}"; @@ -6,10 +6,20 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + patches = [ + # backported from + # https://github.com/dbry/WavPack/commit/12867b33e2de3e95b88d7cb6f449ce0c5c87cdd5 + ./wavpack_clang.patch + ]; + preConfigure = '' sed -i '2iexec_prefix=@exec_prefix@' wavpack.pc.in ''; + # --disable-asm is required for clang + # https://github.com/dbry/WavPack/issues/3 + configureFlags = lib.optionalString stdenv.cc.isClang "--disable-asm"; + src = fetchurl { url = "http://www.wavpack.com/${name}.tar.bz2"; sha256 = "0bmgwcvch3cjcivk7pyasqysj0s81wkg40j3zfrcd7bl0qhmqgn6"; diff --git a/pkgs/development/libraries/wavpack/wavpack_clang.patch b/pkgs/development/libraries/wavpack/wavpack_clang.patch new file mode 100644 index 000000000000..dfbe47181431 --- /dev/null +++ b/pkgs/development/libraries/wavpack/wavpack_clang.patch @@ -0,0 +1,25 @@ +diff -ru -x '*~' wavpack-4.75.0_orig/src/wavpack_local.h wavpack-4.75.0/src/wavpack_local.h +--- wavpack-4.75.0_orig/src/wavpack_local.h 2015-05-21 06:50:26.000000000 +0900 ++++ wavpack-4.75.0/src/wavpack_local.h 2015-09-14 21:48:09.000000000 +0900 +@@ -650,9 +650,9 @@ + void scan_word (WavpackStream *wps, int32_t *samples, uint32_t num_samples, int dir); + void update_error_limit (WavpackStream *wps); + +-const uint32_t bitset [32]; +-const uint32_t bitmask [32]; +-const char nbits_table [256]; ++extern const uint32_t bitset [32]; ++extern const uint32_t bitmask [32]; ++extern const char nbits_table [256]; + + int log2s (int32_t value); + int32_t exp2s (int log); +@@ -734,7 +734,7 @@ + /////////////////////////////////// common utilities //////////////////////////////////// + // module: common_utils.c + +-const uint32_t sample_rates [16]; ++extern const uint32_t sample_rates [16]; + uint32_t WavpackGetLibraryVersion (void); + const char *WavpackGetLibraryVersionString (void); + uint32_t WavpackGetSampleRate (WavpackContext *wpc); |