From fb9b7446ee0f2e57e6819982121ac01fa15d9601 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 19 Sep 2019 22:09:57 +0200 Subject: [PATCH 1/2] piper: temporarily propagate gobject-introspection On startup piper would be unable to find Pango: > ImportError: Typelib file for namespace 'Pango', version '1.0' not found Workaround for #56943 --- pkgs/os-specific/linux/piper/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/piper/default.nix b/pkgs/os-specific/linux/piper/default.nix index e177b284bbda..be3a5612a297 100644 --- a/pkgs/os-specific/linux/piper/default.nix +++ b/pkgs/os-specific/linux/piper/default.nix @@ -16,8 +16,12 @@ python3.pkgs.buildPythonApplication rec { }; nativeBuildInputs = [ meson ninja gettext pkgconfig wrapGAppsHook desktop-file-utils appstream-glib gobject-introspection ]; - buildInputs = [ gtk3 glib gnome3.adwaita-icon-theme python3 ]; - propagatedBuildInputs = with python3.pkgs; [ lxml evdev pygobject3 ]; + buildInputs = [ + gtk3 glib gnome3.adwaita-icon-theme python3 + ]; + propagatedBuildInputs = with python3.pkgs; [ lxml evdev pygobject3 ] ++ [ + gobject-introspection # fixes https://github.com/NixOS/nixpkgs/issues/56943 for now + ]; postPatch = '' chmod +x meson_install.sh # patchShebangs requires executable file From 67844e82be499d823022aa1a742a1187800195c4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 19 Sep 2019 22:16:27 +0200 Subject: [PATCH 2/2] piper: 0.2.903 -> 0.3 --- pkgs/os-specific/linux/piper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/piper/default.nix b/pkgs/os-specific/linux/piper/default.nix index be3a5612a297..1229c442fa22 100644 --- a/pkgs/os-specific/linux/piper/default.nix +++ b/pkgs/os-specific/linux/piper/default.nix @@ -4,7 +4,7 @@ python3.pkgs.buildPythonApplication rec { pname = "piper"; - version = "0.2.903"; + version = "0.3"; format = "other"; @@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec { owner = "libratbag"; repo = "piper"; rev = version; - sha256 = "0zh4lm074x5gwvx663bapdyv8lf84yjwfg8cpf77rszyja1hx13a"; + sha256 = "1vz7blhx6qsfrk5znwr0fj1k8vahnlaz6rn7ifcgxmq398mmz8z7"; }; nativeBuildInputs = [ meson ninja gettext pkgconfig wrapGAppsHook desktop-file-utils appstream-glib gobject-introspection ];