Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c42e7c477c01
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 248097ca269c
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Mar 24, 2020

  1. pyglet: support ffmpeg libraries

    mt-caret authored and Jon committed Mar 24, 2020
    Copy the full SHA
    248097c View commit details
Showing with 3 additions and 0 deletions.
  1. +3 −0 pkgs/development/python-modules/pyglet/default.nix
3 changes: 3 additions & 0 deletions pkgs/development/python-modules/pyglet/default.nix
Original file line number Diff line number Diff line change
@@ -11,6 +11,7 @@
, gdk-pixbuf
, fontconfig
, freetype
, ffmpeg-full
}:

buildPythonPackage rec {
@@ -52,6 +53,8 @@ buildPythonPackage rec {
path = '${fontconfig.lib}/lib/libfontconfig${ext}'
elif name == 'freetype':
path = '${freetype}/lib/libfreetype${ext}'
elif name[0:2] == 'av' or name[0:2] == 'sw':
path = '${ffmpeg-full}/lib/lib' + name + '${ext}'
if path is not None:
return ctypes.cdll.LoadLibrary(path)
raise Exception("Could not load library {}".format(names))