diff options
| author | Will Dietz <w@wdtz.org> | 2018-03-24 20:49:12 -0500 |
|---|---|---|
| committer | Will Dietz <w@wdtz.org> | 2018-03-25 20:25:01 -0500 |
| commit | 3bf20021999d7095fc10073d84d28d9c7b648bf0 (patch) | |
| tree | c7f1f10e05b69eab577ca5707db556b4a35ee8d9 /pkgs/development/libraries/celt | |
| parent | 8349d73c8f57606f95e2b2ffee65e8e9a060ea45 (diff) | |
| download | nixpkgs-3bf20021999d7095fc10073d84d28d9c7b648bf0.tar nixpkgs-3bf20021999d7095fc10073d84d28d9c7b648bf0.tar.gz nixpkgs-3bf20021999d7095fc10073d84d28d9c7b648bf0.tar.bz2 nixpkgs-3bf20021999d7095fc10073d84d28d9c7b648bf0.tar.lz nixpkgs-3bf20021999d7095fc10073d84d28d9c7b648bf0.tar.xz nixpkgs-3bf20021999d7095fc10073d84d28d9c7b648bf0.tar.zst nixpkgs-3bf20021999d7095fc10073d84d28d9c7b648bf0.zip | |
celt-0.5.1: disable tests that fail to build due to bad code
These were fixed upstream, but patches don't apply to 0.5.1 which we need to use for spice. Instead of maintaining backported patches for very deprecated software, just don't build the tests in the first place.
Diffstat (limited to 'pkgs/development/libraries/celt')
| -rw-r--r-- | pkgs/development/libraries/celt/0.5.1.nix | 7 | ||||
| -rw-r--r-- | pkgs/development/libraries/celt/generic.nix | 3 |
2 files changed, 10 insertions, 0 deletions
diff --git a/pkgs/development/libraries/celt/0.5.1.nix b/pkgs/development/libraries/celt/0.5.1.nix index 561be1ba281..e45d74345d4 100644 --- a/pkgs/development/libraries/celt/0.5.1.nix +++ b/pkgs/development/libraries/celt/0.5.1.nix @@ -7,4 +7,11 @@ callPackage ./generic.nix (args // rec{ url = "http://downloads.xiph.org/releases/celt/celt-${version}.tar.gz"; sha256 = "0bkam9z5vnrxpbxkkh9kw6yzjka9di56h11iijikdd1f71l5nbpw"; }; + + # Don't build tests due to badness with ec_ilog + prePatch = '' + substituteInPlace Makefile.in \ + --replace 'SUBDIRS = libcelt tests' \ + 'SUBDIRS = libcelt' + ''; }) diff --git a/pkgs/development/libraries/celt/generic.nix b/pkgs/development/libraries/celt/generic.nix index 4ab554561f7..9d861f2c432 100644 --- a/pkgs/development/libraries/celt/generic.nix +++ b/pkgs/development/libraries/celt/generic.nix @@ -1,5 +1,6 @@ { stdenv, version, src , liboggSupport ? true, libogg ? null # if disabled only the library will be built +, prePatch ? "" , ... }: @@ -10,6 +11,8 @@ stdenv.mkDerivation rec { inherit src; + inherit prePatch; + buildInputs = [] ++ stdenv.lib.optional liboggSupport libogg; |