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

Commits on Apr 10, 2020

  1. python3Packages.gst-python: fix build on darwin

    @marsam
    marsam committed Apr 10, 2020
    Copy the full SHA
    fa03212 View commit details

Commits on Apr 11, 2020

  1. Merge pull request #84957 from marsam/fix-python3Packages.gst-python-… 

    …darwin

python3Packages.gst-python: fix build on darwin
    @marsam
    marsam authored Apr 11, 2020
    Copy the full SHA
    6246f24 View commit details
Showing with 9 additions and 0 deletions.
  1. +9 −0 pkgs/development/python-modules/gst-python/default.nix
9 changes: 9 additions & 0 deletions pkgs/development/python-modules/gst-python/default.nix
View file
Original file line number Diff line number Diff line change
@@ -9,6 +9,7 @@
, gobject-introspection
, gst-plugins-base
, isPy3k
, fetchpatch
}:

buildPythonPackage rec {
@@ -38,6 +39,14 @@ buildPythonPackage rec {
pygobject3
];

patches = stdenv.lib.optionals stdenv.isDarwin [
# Fix configure python lib detection in macOS. Remove with the next release
(fetchpatch {
url = "https://github.com/GStreamer/gst-python/commit/f98c206bdf01529f8ea395a719b10baf2bdf717f.patch";
sha256 = "04n4zrnfivgr7iaqw4sjlbd882s8halc2bbbhfxqf0sg2lqwmrxg";
})
];

mesonFlags = [
"-Dpython=python${if isPy3k then "3" else "2"}"
"-Dpygi-overrides-dir=${placeholder "out"}/${python.sitePackages}/gi/overrides"