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

Commits on Oct 29, 2020

  1. gstreamer: needs Xext build input when x11 is enabled 

    Fixes #102023

Signed-off-by: Christian Stewart <christian@paral.in>
    @paralin
    paralin committed Oct 29, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    tadeokondrak Tadeo Kondrak
    GPG key ID: D41E092CA43F1D8B
    Verified
    Learn about vigilant mode
    Copy the full SHA
    2537e11 View commit details

  2. Merge pull request #102032 from paralin/fix-gstreamer-plugins-base-xext 

    gstreamer: needs Xext build input when x11 is enabled
    @nh2
    nh2 authored Oct 29, 2020
    Copy the full SHA
    bc2b206 View commit details
Showing with 2 additions and 0 deletions.
  1. +2 −0 pkgs/development/libraries/gstreamer/base/default.nix
2 changes: 2 additions & 0 deletions pkgs/development/libraries/gstreamer/base/default.nix
View file
Original file line number Diff line number Diff line change
@@ -21,6 +21,7 @@
, libGL
, enableX11 ? stdenv.isLinux
, libXv
, libXext
, enableWayland ? stdenv.isLinux
, wayland
, wayland-protocols
@@ -84,6 +85,7 @@ stdenv.mkDerivation rec {
] ++ lib.optionals enableAlsa [
alsaLib
] ++ lib.optionals enableX11 [
libXext
libXv
pango
] ++ lib.optionals enableWayland [