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

Commits on Jun 16, 2020

  1. i3pystatus: 2019-06-10 -> 2020-06-12

    @Mic92
    Mic92 committed Jun 16, 2020
    Copy the full SHA
    4378ec4 View commit details

  2. i3pystatus: fix desktop notifications

    @Mic92
    Mic92 committed Jun 16, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    5360dec View commit details

Commits on Jun 17, 2020

  1. Merge pull request #90456 from Mic92/i3pystatus

    @Mic92
    Mic92 authored Jun 17, 2020
    Copy the full SHA
    62c02ec View commit details
Showing with 27 additions and 13 deletions.
  1. +27 −13 pkgs/applications/window-managers/i3/pystatus.nix
40 changes: 27 additions & 13 deletions pkgs/applications/window-managers/i3/pystatus.nix
View file
Original file line number Diff line number Diff line change
@@ -1,31 +1,45 @@
{ stdenv, fetchFromGitHub, libpulseaudio, python3Packages, extraLibs ? [] }:
{ stdenv
, fetchFromGitHub
, libpulseaudio
, libnotify
, gobject-introspection
, python3Packages
, wrapGAppsHook
, extraLibs ? [] }:

python3Packages.buildPythonApplication rec {
# i3pystatus moved to rolling release:
# https://github.com/enkore/i3pystatus/issues/584
version = "unstable-2019-06-10";
version = "unstable-2020-06-12";
pname = "i3pystatus";

src = fetchFromGitHub
{
src = fetchFromGitHub {
owner = "enkore";
repo = "i3pystatus";
rev = "56ce08d0ff8d5d64950d6b588ebede35a95e0ce2";
sha256 = "12938860jbcly1xwhd71jvy2dff28pwv9kqh6mab1859148bzmcg";
rev = "dad5eb0c5c8a2ecd20c37ade4732586c6e53f44b";
sha256 = "18ygvkl92yr69kxsym57k1mc90asdxpz4b943i61qr0s4fc5n4mq";
};

propagatedBuildInputs = with python3Packages; [ keyring colour netifaces psutil basiciw ] ++
[ libpulseaudio ] ++ extraLibs;
buildInputs = [ libpulseaudio libnotify gobject-introspection ];

libpulseaudioPath = stdenv.lib.makeLibraryPath [ libpulseaudio ];
ldWrapperSuffix = "--suffix LD_LIBRARY_PATH : \"${libpulseaudioPath}\"";
# LC_TIME != C results in locale.Error: unsupported locale setting
makeWrapperArgs = [ "--set LC_TIME C" ldWrapperSuffix ]; # libpulseaudio.so is loaded manually
propagatedBuildInputs = with python3Packages; [
keyring colour netifaces psutil basiciw pygobject3
] ++ extraLibs;

makeWrapperArgs = [
# LC_TIME != C results in locale.Error: unsupported locale setting
"--set" "LC_TIME" "C"
"--suffix" "LD_LIBRARY_PATH" ":" "${stdenv.lib.makeLibraryPath [ libpulseaudio ]}"
];

postPatch = ''
makeWrapperArgs+=(--set GI_TYPELIB_PATH "$GI_TYPELIB_PATH")
'';

postInstall = ''
makeWrapper ${python3Packages.python.interpreter} $out/bin/${pname}-python-interpreter \
--prefix PYTHONPATH : "$PYTHONPATH" \
${ldWrapperSuffix}
''${makeWrapperArgs[@]}
'';

# no tests in tarball