diff options
author | William A. Kennington III <william@wkennington.com> | 2015-03-25 15:36:56 -0700 |
---|---|---|
committer | William A. Kennington III <william@wkennington.com> | 2015-03-25 15:36:56 -0700 |
commit | 838acbe7018b8dda609468dd7c5f99300e585b24 (patch) | |
tree | fb2f2d975ddb2eca41f0726a178d05b6ba942883 /pkgs/development/libraries | |
parent | fe6055dc2a1fabea8eebabd268943d19fb12d7b7 (diff) | |
parent | 7adbb34315555a81028502d5c487544eab8e1b1b (diff) | |
download | nixlib-838acbe7018b8dda609468dd7c5f99300e585b24.tar nixlib-838acbe7018b8dda609468dd7c5f99300e585b24.tar.gz nixlib-838acbe7018b8dda609468dd7c5f99300e585b24.tar.bz2 nixlib-838acbe7018b8dda609468dd7c5f99300e585b24.tar.lz nixlib-838acbe7018b8dda609468dd7c5f99300e585b24.tar.xz nixlib-838acbe7018b8dda609468dd7c5f99300e585b24.tar.zst nixlib-838acbe7018b8dda609468dd7c5f99300e585b24.zip |
Merge pull request #6983 from spwhitt/libtheora
Libtheora
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r-- | pkgs/development/libraries/libtheora/default.nix | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/pkgs/development/libraries/libtheora/default.nix b/pkgs/development/libraries/libtheora/default.nix index cb9367474173..ef7a8ab09a8e 100644 --- a/pkgs/development/libraries/libtheora/default.nix +++ b/pkgs/development/libraries/libtheora/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libogg, libvorbis, tremor, autoconf, automake, libtool}: +{stdenv, fetchurl, libogg, libvorbis, tremor, autoconf, automake, libtool, pkgconfig}: stdenv.mkDerivation ({ name = "libtheora-1.1.1"; @@ -7,12 +7,28 @@ stdenv.mkDerivation ({ sha256 = "0swiaj8987n995rc7hw0asvpwhhzpjiws8kr3s6r44bqqib2k5a0"; }; + buildInputs = [pkgconfig]; + propagatedBuildInputs = [libogg libvorbis]; + # GCC's -fforce-addr flag is not supported by clang + # It's just an optimization, so it's safe to simply remove it + postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace configure --replace "-fforce-addr" "" + ''; + crossAttrs = { propagatedBuildInputs = [libogg.crossDrv tremor.crossDrv]; configureFlags = "--disable-examples"; }; + + meta = with stdenv.lib; { + homepage = http://www.theora.org/; + description = "Library for Theora, a free and open video compression format"; + license = licenses.bsd3; + maintainers = [ maintainers.spwhitt ]; + platforms = platforms.unix; + }; } # It has an old config.guess that doesn't know the mips64el. |