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: c5a9ad1880bc
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8e7c7af3b88c
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on May 18, 2017

  1. ffmpeg: fix arm build

    @abbradar
    abbradar committed May 18, 2017
    Copy the full SHA
    6679dbb View commit details

  2. haskellPackages.hoogle: don't override haskell-src-exts

    @abbradar
    abbradar committed May 18, 2017

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    mweinelt Martin Weinelt
    GPG key ID: BD4AA0528F63F17E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    8e7c7af View commit details
Showing with 4 additions and 6 deletions.
  1. +0 −3 pkgs/development/haskell-modules/configuration-common.nix
  2. +4 −3 pkgs/development/libraries/ffmpeg/generic.nix
3 changes: 0 additions & 3 deletions pkgs/development/haskell-modules/configuration-common.nix
View file
Original file line number Diff line number Diff line change
@@ -688,9 +688,6 @@ self: super: {
# It makes no sense to have intero-nix-shim in Hackage, so we publish it here only.
intero-nix-shim = self.callPackage ../tools/haskell/intero-nix-shim {};

# The latest Hoogle needs versions not yet in LTS Haskell 7.x.
hoogle = super.hoogle.override { haskell-src-exts = self.haskell-src-exts_1_19_1; };

# https://github.com/Philonous/hs-stun/pull/1
# Remove if a version > 0.1.0.1 ever gets released.
stunclient = overrideCabal super.stunclient (drv: {
7 changes: 4 additions & 3 deletions pkgs/development/libraries/ffmpeg/generic.nix
View file
Original file line number Diff line number Diff line change
@@ -55,6 +55,8 @@ let

# Disable dependency that needs fixes before it will work on Darwin or Arm
disDarwinOrArmFix = origArg: minVer: fixArg: if ((isDarwin || isArm) && reqMin minVer) then fixArg else origArg;

vaapiSupport = reqMin "0.6" && ((isLinux || isFreeBSD) && !isArm);
in

assert openglSupport -> mesa != null;
@@ -121,7 +123,7 @@ stdenv.mkDerivation rec {
"--enable-libmp3lame"
(ifMinVer "1.2" "--enable-iconv")
"--enable-libtheora"
(ifMinVer "0.6" (enableFeature (isLinux || isFreeBSD) "vaapi"))
(ifMinVer "0.6" (enableFeature vaapiSupport "vaapi"))
"--enable-vdpau"
"--enable-libvorbis"
(disDarwinOrArmFix (ifMinVer "0.6" "--enable-libvpx") "0.6" "--disable-libvpx")
@@ -197,8 +199,7 @@ stdenv.mkDerivation rec {
installFlags = [ "install-man" ];

passthru = {
vaapiSupport = if reqMin "0.6" && ((isLinux || isFreeBSD) && !isArm) then true else false;
inherit vdpauSupport;
inherit vaapiSupport vdpauSupport;
};

meta = with stdenv.lib; {