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: 04000331c10f
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 1a931f1f60fb
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 4, 2020

  1. ffmpeg: fix cross compilation

    @danielfullmer @Mic92
    danielfullmer authored and Mic92 committed Jan 4, 2020
    Copy the full SHA
    1b591ac View commit details
    Browse the repository at this point in the history

  2. Revert "ffmpeg: fix cross compilation" 

    This reverts commit f6f8f0b.

avoid mass-rebuild on master; move to staging instead.
    @Mic92
    Mic92 committed Jan 4, 2020
    Copy the full SHA
    7d46f73 View commit details
    Browse the repository at this point in the history

  3. Revert "Revert "ffmpeg: fix cross compilation"" 

    This reverts commit 7d46f73.

This change was accidentally commit to master. To avoid a mass-rebuild we
actually apply this change on staging first.
    @Mic92
    Mic92 committed Jan 4, 2020
    Copy the full SHA
    1a931f1 View commit details
    Browse the repository at this point in the history