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
base: 773c8c753d43
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: c63aa4a92724
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Nov 26, 2020

  1. blender: use ffmpeg instead of ffmpeg_3 

    build_files/cmake/Modules/FindFFmpeg.cmake currently searches for
libavcodec/ac3_parser.h which is not present in ffmpeg_3 (at least on
darwin).
    @veprbl
    veprbl committed Nov 26, 2020
    Copy the full SHA
    d9d8c8a View commit details
    Browse the repository at this point in the history

  2. blender: fix on darwin

    @veprbl
    veprbl committed Nov 26, 2020
    Copy the full SHA
    492f3b8 View commit details
    Browse the repository at this point in the history

Commits on Nov 27, 2020

  1. Merge pull request #105066 from veprbl/pr/blender_darwin_fix_2 

    blender: fix on darwin
    @gebner
    gebner committed Nov 27, 2020
    Copy the full SHA
    c63aa4a View commit details
    Browse the repository at this point in the history