public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #37831 from dtzWill/fix/celt-0.5.1-disable-broken-tests

Browse Source 
celt-0.5.1: disable tests that fail to build due to bad code
This commit is contained in:
Will Dietz 2018-03-26 15:24:45 -05:00 committed by GitHub
commit 49726921d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/libraries/celt/0.5.1.nix
View File

@ -7,4 +7,11 @@ callPackage ./generic.nix (args // rec{
url = "http://downloads.xiph.org/releases/celt/celt-${version}.tar.gz"; url = "http://downloads.xiph.org/releases/celt/celt-${version}.tar.gz";
sha256 = "0bkam9z5vnrxpbxkkh9kw6yzjka9di56h11iijikdd1f71l5nbpw"; sha256 = "0bkam9z5vnrxpbxkkh9kw6yzjka9di56h11iijikdd1f71l5nbpw";
}; };
# Don't build tests due to badness with ec_ilog
prePatch = ''
substituteInPlace Makefile.in \
--replace 'SUBDIRS = libcelt tests' \
'SUBDIRS = libcelt'
'';
}) })

3
pkgs/development/libraries/celt/generic.nix
View File

@ -1,5 +1,6 @@
{ stdenv, version, src { stdenv, version, src
, liboggSupport ? true, libogg ? null # if disabled only the library will be built , liboggSupport ? true, libogg ? null # if disabled only the library will be built
, prePatch ? ""
, ... , ...
}: }:
@ -10,6 +11,8 @@ stdenv.mkDerivation rec {
inherit src; inherit src;
inherit prePatch;
buildInputs = [] buildInputs = []
++ stdenv.lib.optional liboggSupport libogg; ++ stdenv.lib.optional liboggSupport libogg;