diff options
| author | Alyssa Ross <hi@alyssa.is> | 2024-02-20 12:16:56 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2024-02-20 12:16:56 +0100 |
| commit | b24d64b3b1ef897f07cd072a88a9881cb330aa7f (patch) | |
| tree | a87bb2eed9af3ef1efd51dd65221d91f0c949041 /nixpkgs/pkgs/development/libraries/libtheora | |
| parent | 73338df7473bb3810e70a16b8b0cba4f0f606f2b (diff) | |
| parent | fa15b53dbea5028db38d6e09b4cef6eba42aeebb (diff) | |
| download | nixlib-b24d64b3b1ef897f07cd072a88a9881cb330aa7f.tar nixlib-b24d64b3b1ef897f07cd072a88a9881cb330aa7f.tar.gz nixlib-b24d64b3b1ef897f07cd072a88a9881cb330aa7f.tar.bz2 nixlib-b24d64b3b1ef897f07cd072a88a9881cb330aa7f.tar.lz nixlib-b24d64b3b1ef897f07cd072a88a9881cb330aa7f.tar.xz nixlib-b24d64b3b1ef897f07cd072a88a9881cb330aa7f.tar.zst nixlib-b24d64b3b1ef897f07cd072a88a9881cb330aa7f.zip | |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libtheora')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/libtheora/default.nix | 6 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/libtheora/mingw-remove-export.patch | 18 |
2 files changed, 22 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libtheora/default.nix b/nixpkgs/pkgs/development/libraries/libtheora/default.nix index c61a4dc96162..45b7e4caaf1d 100644 --- a/nixpkgs/pkgs/development/libraries/libtheora/default.nix +++ b/nixpkgs/pkgs/development/libraries/libtheora/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, libogg, libvorbis, pkg-config, autoreconfHook, fetchpatch }: +{ lib, stdenv, fetchurl, libogg, libvorbis, pkg-config, autoreconfHook, fetchpatch }: stdenv.mkDerivation rec { pname = "libtheora"; @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { url = "https://github.com/xiph/theora/commit/28cc6dbd9b2a141df94f60993256a5fca368fa54.diff"; sha256 = "16jqrq4h1b3krj609vbpzd5845cvkbh3mwmjrcdg35m490p19x9k"; }) + ] ++ lib.optionals stdenv.hostPlatform.isMinGW [ + ./mingw-remove-export.patch ]; configureFlags = [ "--disable-examples" ]; @@ -30,6 +32,6 @@ stdenv.mkDerivation rec { description = "Library for Theora, a free and open video compression format"; license = licenses.bsd3; maintainers = with maintainers; [ ]; - platforms = platforms.unix; + platforms = platforms.unix ++ platforms.windows; }; } diff --git a/nixpkgs/pkgs/development/libraries/libtheora/mingw-remove-export.patch b/nixpkgs/pkgs/development/libraries/libtheora/mingw-remove-export.patch new file mode 100644 index 000000000000..bf0ffc07fc43 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libtheora/mingw-remove-export.patch @@ -0,0 +1,18 @@ +diff --git a/win32/xmingw32/libtheoradec-all.def b/win32/xmingw32/libtheoradec-all.def +index 566eeb3..4a2e766 100644 +--- a/win32/xmingw32/libtheoradec-all.def ++++ b/win32/xmingw32/libtheoradec-all.def +@@ -1,4 +1,3 @@ +-EXPORTS + ; Old alpha API + theora_version_string @ 1 + theora_version_number @ 2 +diff --git a/win32/xmingw32/libtheoraenc-all.def b/win32/xmingw32/libtheoraenc-all.def +index 36d2dad..d1da2f4 100644 +--- a/win32/xmingw32/libtheoraenc-all.def ++++ b/win32/xmingw32/libtheoraenc-all.def +@@ -1,4 +1,3 @@ +-EXPORTS + ; Old alpha API + theora_encode_init @ 1 + theora_encode_YUVin @ 2 |