diff options
| author | Jörg Thalheim <joerg@thalheim.io> | 2020-06-15 08:34:06 +0100 |
|---|---|---|
| committer | Jörg Thalheim <joerg@thalheim.io> | 2020-06-16 07:45:03 +0100 |
| commit | 4378ec4805ea6cb501d566692ddb3c5638d94b74 (patch) | |
| tree | 06e66abda79cc02af92244f71bcb87f4dc0af230 /pkgs/applications/window-managers/i3 | |
| parent | 5fea23b9c099a0441222b0a4db75d165094deefa (diff) | |
| download | nixpkgs-4378ec4805ea6cb501d566692ddb3c5638d94b74.tar nixpkgs-4378ec4805ea6cb501d566692ddb3c5638d94b74.tar.gz nixpkgs-4378ec4805ea6cb501d566692ddb3c5638d94b74.tar.bz2 nixpkgs-4378ec4805ea6cb501d566692ddb3c5638d94b74.tar.lz nixpkgs-4378ec4805ea6cb501d566692ddb3c5638d94b74.tar.xz nixpkgs-4378ec4805ea6cb501d566692ddb3c5638d94b74.tar.zst nixpkgs-4378ec4805ea6cb501d566692ddb3c5638d94b74.zip | |
i3pystatus: 2019-06-10 -> 2020-06-12
Diffstat (limited to 'pkgs/applications/window-managers/i3')
| -rw-r--r-- | pkgs/applications/window-managers/i3/pystatus.nix | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/pkgs/applications/window-managers/i3/pystatus.nix b/pkgs/applications/window-managers/i3/pystatus.nix index 29bda8e4e2b..1a6d3d591e1 100644 --- a/pkgs/applications/window-managers/i3/pystatus.nix +++ b/pkgs/applications/window-managers/i3/pystatus.nix @@ -1,26 +1,32 @@ { stdenv, fetchFromGitHub, libpulseaudio, python3Packages, extraLibs ? [] }: -python3Packages.buildPythonApplication rec { +let + ldWrapperSuffix = "--suffix LD_LIBRARY_PATH : \"${stdenv.lib.makeLibraryPath [ libpulseaudio ]}\""; +in 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; - 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 + makeWrapperArgs = [ + "--set" "LC_TIME" "C" + ldWrapperSuffix + ]; # libpulseaudio.so is loaded manually + + postConfigure = '' + makeWrapperArgs+=("--set" "GI_TYPELIB_PATH" "$GI_TYPELIB_PATH") + ''; postInstall = '' makeWrapper ${python3Packages.python.interpreter} $out/bin/${pname}-python-interpreter \ |