git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #90456 from Mic92/i3pystatus
commit62c02ec3bda563ce5623915ec3b0d9daa77da324 authorJörg Thalheim <Mic92@users.noreply.github.com> dateWed 17 Jun 2020, 08:55 (6 years ago) parentdf54fe65360dec
1 file changed+27−13
pkgs/applications/window-managers/i3/pystatus.nix+27−13
pkgs/applications/window-managers/i3/pystatus.nix+27−13
@@ -1,31 +1,45 @@
1−{ stdenv, fetchFromGitHub, libpulseaudio, python3Packages, extraLibs ? [] }:
1+{ stdenv
2+, fetchFromGitHub
3+, libpulseaudio
4+, libnotify
5+, gobject-introspection
6+, python3Packages
7+, wrapGAppsHook
8+, extraLibs ? [] }:
29
310python3Packages.buildPythonApplication rec {
411 # i3pystatus moved to rolling release:
512 # https://github.com/enkore/i3pystatus/issues/584
6− version = "unstable-2019-06-10";
13+ version = "unstable-2020-06-12";
714 pname = "i3pystatus";
815
9− src = fetchFromGitHub
10− {
16+ src = fetchFromGitHub {
1117 owner = "enkore";
1218 repo = "i3pystatus";
13− rev = "56ce08d0ff8d5d64950d6b588ebede35a95e0ce2";
14− sha256 = "12938860jbcly1xwhd71jvy2dff28pwv9kqh6mab1859148bzmcg";
19+ rev = "dad5eb0c5c8a2ecd20c37ade4732586c6e53f44b";
20+ sha256 = "18ygvkl92yr69kxsym57k1mc90asdxpz4b943i61qr0s4fc5n4mq";
1521 };
1622
17− propagatedBuildInputs = with python3Packages; [ keyring colour netifaces psutil basiciw ] ++
18− [ libpulseaudio ] ++ extraLibs;
23+ buildInputs = [ libpulseaudio libnotify gobject-introspection ];
1924
20− libpulseaudioPath = stdenv.lib.makeLibraryPath [ libpulseaudio ];
21− ldWrapperSuffix = "--suffix LD_LIBRARY_PATH : \"${libpulseaudioPath}\"";
22− # LC_TIME != C results in locale.Error: unsupported locale setting
23− makeWrapperArgs = [ "--set LC_TIME C" ldWrapperSuffix ]; # libpulseaudio.so is loaded manually
25+ propagatedBuildInputs = with python3Packages; [
26+ keyring colour netifaces psutil basiciw pygobject3
27+ ] ++ extraLibs;
28+
29+ makeWrapperArgs = [
30+ # LC_TIME != C results in locale.Error: unsupported locale setting
31+ "--set" "LC_TIME" "C"
32+ "--suffix" "LD_LIBRARY_PATH" ":" "${stdenv.lib.makeLibraryPath [ libpulseaudio ]}"
33+ ];
34+
35+ postPatch = ''
36+ makeWrapperArgs+=(--set GI_TYPELIB_PATH "$GI_TYPELIB_PATH")
37+ '';
2438
2539 postInstall = ''
2640 makeWrapper ${python3Packages.python.interpreter} $out/bin/${pname}-python-interpreter \
2741 --prefix PYTHONPATH : "$PYTHONPATH" \
28− ${ldWrapperSuffix}
42+ ''${makeWrapperArgs[@]}
2943 '';
3044
3145 # no tests in tarball