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

Commits on Oct 18, 2019

  1. kazam: fix 

    - work around strictDeps issue wit python packages
- use pr 21 commit instead of debian patch to fix configparser issue

(cherry picked from commit 15953b7)
    @thorstenweber83 @worldofpeace
    thorstenweber83 authored and worldofpeace committed Oct 18, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    makefu Felix Richter
    GPG key ID: 36F7711F3FC0F225
    Verified
    Learn about vigilant mode
    Copy the full SHA
    4ba1af2 View commit details
Showing with 9 additions and 5 deletions.
  1. +9 −5 pkgs/applications/video/kazam/default.nix
14 changes: 9 additions & 5 deletions pkgs/applications/video/kazam/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{ stdenv, fetchurl, substituteAll, python3, gst_all_1, wrapGAppsHook, gobject-introspection
, gtk3, libwnck3, keybinder3, intltool, libcanberra-gtk3, libappindicator-gtk3, libpulseaudio }:
, gtk3, libwnck3, keybinder3, intltool, libcanberra-gtk3, libappindicator-gtk3, libpulseaudio
, fetchpatch }:

python3.pkgs.buildPythonApplication rec {
name = "kazam-${version}";
@@ -18,6 +19,9 @@ python3.pkgs.buildPythonApplication rec {
];

propagatedBuildInputs = with python3.pkgs; [ pygobject3 pyxdg pycairo dbus-python ];

# workaround https://github.com/NixOS/nixpkgs/issues/56943
strictDeps = false;

patches = [
# Fix paths
@@ -26,10 +30,10 @@ python3.pkgs.buildPythonApplication rec {
libcanberra = libcanberra-gtk3;
inherit libpulseaudio;
})
# Fix compability with Python 3.4
(fetchurl {
url = https://sources.debian.org/data/main/k/kazam/1.4.5-2/debian/patches/configparser_api_changes.patch;
sha256 = "0yvmipnh98s7y07cp1f113l0qqfw65k13an96byq707z3ymv1c2h";
# https://github.com/hzbd/kazam/pull/21
(fetchpatch {
url = https://github.com/hzbd/kazam/commit/37e53a5aa61f4223a9ea03ceeda26eeba2b9d37b.patch;
sha256 = "1q5dpmdm6cvgzw8xa7bwclnqa05xc73ja1lszwmwv5glyik0fk4z";
})
];