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: eda5b46cab2e
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6d883df7801a
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jul 30, 2017

  1. ffmpeg-full: fix path to frei0r filters 

    Fixes #27555.
    @rycee
    rycee committed Jul 30, 2017
    Copy the full SHA
    f36323c View commit details

  2. Merge pull request #27765 from rycee/fix/ffmpeg/frei0r-plugin 

    ffmpeg-full: fix path to frei0r filters
    @Mic92
    Mic92 authored Jul 30, 2017
    Copy the full SHA
    6d883df View commit details
Showing with 5 additions and 0 deletions.
  1. +5 −0 pkgs/development/libraries/ffmpeg-full/default.nix
5 changes: 5 additions & 0 deletions pkgs/development/libraries/ffmpeg-full/default.nix
View file
Original file line number Diff line number Diff line change
@@ -241,6 +241,11 @@ stdenv.mkDerivation rec {
patchPhase = ''patchShebangs .
'' + stdenv.lib.optionalString stdenv.isDarwin ''
sed -i 's/#ifndef __MAC_10_11/#if 1/' ./libavcodec/audiotoolboxdec.c
'' + stdenv.lib.optionalString (frei0r != null) ''
substituteInPlace libavfilter/vf_frei0r.c \
--replace /usr/local/lib/frei0r-1 ${frei0r}/lib/frei0r-1
substituteInPlace doc/filters.texi \
--replace /usr/local/lib/frei0r-1 ${frei0r}/lib/frei0r-1
'';

configureFlags = [