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

Commits on Nov 29, 2018

  1. python2.pkgs.gst-python: fix build

    @jtojnar
    jtojnar committed Nov 29, 2018
    Copy the full SHA
    ca11db8 View commit details
Showing with 11 additions and 0 deletions.
  1. +11 −0 pkgs/development/python-modules/gst-python/default.nix
11 changes: 11 additions & 0 deletions pkgs/development/python-modules/gst-python/default.nix
View file
Original file line number Diff line number Diff line change
@@ -28,6 +28,17 @@ in buildPythonPackage rec {
url = https://bugzilla.gnome.org/attachment.cgi?id=371989;
sha256 = "1k46nvw175c1wvkqnx783i9d4w9vn431spcl48jb3y224jj3va08";
})
# Fixes `from gi.repository import Gst` when gst-python's site-package is in
# PYTHONPATH
(fetchurl {
url = https://gitlab.freedesktop.org/gstreamer/gst-python/commit/d64bbc1e0c3c948c148f505cc5f856ce56732880.diff;
sha256 = "1n9pxmcl1x491mp47avpcw2a6n71lm0haz6mfas168prkgsk8q3r";
})
# Fixes python2 build from the above changes
(fetchurl {
url = https://gitlab.freedesktop.org/gstreamer/gst-python/commit/f79ac2d1434d7ba9717f3e943cfdc76e121eb5dd.diff;
sha256 = "17a164b0v36g0kwiqdlkjx6g0pjhcs6ilizck7iky8bgjnmiypm1";
})
];

# TODO: First python_dep in meson.build needs to be removed