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: a718f72a8e88
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 987ec8aed453
Choose a head ref
  • 2 commits
  • 4 files changed
  • 2 contributors

Commits on Jun 21, 2019

  1. gstreamer: fix darwin build

    @LnL7
    LnL7 committed Jun 21, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    dasJ Janne Heß
    GPG key ID: 69165158F05265DF
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    2962730 View commit details

  2. Merge pull request #63627 from LnL7/darwin-gstreamer 

    gstreamer: fix darwin build
    @matthewbauer
    matthewbauer authored Jun 21, 2019
    Copy the full SHA
    987ec8a View commit details
13 changes: 8 additions & 5 deletions pkgs/development/libraries/gstreamer/core/default.nix
View file
Original file line number Diff line number Diff line change
@@ -7,6 +7,7 @@
, docbook_xsl, docbook_xml_dtd_412
, gtk-doc
, lib
, CoreServices
}:

stdenv.mkDerivation rec {
@@ -41,18 +42,20 @@ stdenv.mkDerivation rec {
docbook_xsl docbook_xml_dtd_412
];

buildInputs =
lib.optionals stdenv.isLinux [ libcap libunwind elfutils ]
++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.CoreServices;
buildInputs = [ libunwind ]
++ lib.optionals stdenv.isLinux [ libcap elfutils ]
++ lib.optional stdenv.isDarwin CoreServices;

propagatedBuildInputs = [ glib ];

mesonFlags = [
# Enables all features, so that we know when new dependencies are necessary.
"-Dauto_features=enabled"
# "-Dauto_features=enabled"
"-Ddbghelp=disabled" # not needed as we already provide libunwind and libdw, and dbghelp is a fallback to those
"-Dexamples=disabled" # requires many dependencies and probably not useful for our users
];
]
# darwin.libunwind doesn't have pkgconfig definitions so meson doesn't detect it.
++ stdenv.lib.optional stdenv.isDarwin "-DHAVE_UNWIND=1";

postInstall = ''
for prog in "$dev/bin/"*; do
4 changes: 2 additions & 2 deletions pkgs/development/libraries/gstreamer/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ callPackage }:
{ callPackage, CoreServices }:

rec {
gstreamer = callPackage ./core { };
gstreamer = callPackage ./core { inherit CoreServices; };

gstreamermm = callPackage ./gstreamermm { };

3 changes: 2 additions & 1 deletion pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ fetchurl, fetchpatch, stdenv, autoreconfHook
, perl, bison2, flex, pkgconfig, glib, libxml2, libintl
, perl, bison2, flex, pkgconfig, glib, libxml2, libintl, libunwind
}:

stdenv.mkDerivation rec {
@@ -16,6 +16,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];

nativeBuildInputs = [ autoreconfHook flex perl pkgconfig libintl bison2 glib ];
buildInputs = stdenv.lib.optional stdenv.isDarwin libunwind;
propagatedBuildInputs = [ glib libxml2 ];

patches = [
1 change: 1 addition & 0 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -10671,6 +10671,7 @@ in

gst_all_1 = recurseIntoAttrs(callPackage ../development/libraries/gstreamer {
callPackage = newScope { libav = pkgs.ffmpeg_4; };
inherit (darwin.apple_sdk.frameworks) CoreServices;
});

gstreamer = callPackage ../development/libraries/gstreamer/legacy/gstreamer { };