From 95c4adac0ec759f1edad63998cd5723af9a88ab6 Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Mon, 11 Nov 2019 14:01:00 +0200 Subject: polybar: 3.4.0 -> 3.4.1 - Replace `python2` with `python3` Co-authored-by: Sam Doshi --- pkgs/applications/misc/polybar/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'pkgs/applications/misc/polybar') diff --git a/pkgs/applications/misc/polybar/default.nix b/pkgs/applications/misc/polybar/default.nix index 9ca8c696184..d7023fc29f9 100644 --- a/pkgs/applications/misc/polybar/default.nix +++ b/pkgs/applications/misc/polybar/default.nix @@ -1,5 +1,5 @@ { cairo, cmake, fetchFromGitHub, libXdmcp, libpthreadstubs, libxcb, pcre, pkgconfig -, python2, stdenv, xcbproto, xcbutil, xcbutilcursor, xcbutilimage +, python3, stdenv, xcbproto, xcbutil, xcbutilcursor, xcbutilimage , xcbutilrenderutil, xcbutilwm, xcbutilxrm, makeWrapper # optional packages-- override the variables ending in 'Support' to enable or @@ -24,15 +24,16 @@ assert nlSupport -> ! iwSupport && libnl != null; assert i3Support -> ! i3GapsSupport && jsoncpp != null && i3 != null; assert i3GapsSupport -> ! i3Support && jsoncpp != null && i3-gaps != null; -stdenv.mkDerivation rec { +let xcbproto-py3 = xcbproto.override { python = python3; }; +in stdenv.mkDerivation rec { pname = "polybar"; - version = "3.4.0"; + version = "3.4.1"; src = fetchFromGitHub { - owner = "jaagr"; + owner = pname; repo = pname; rev = version; - sha256 = "1g3zj0788cdlm8inpl19279bw8zjcy7dzj7q4f1l2d8c8g1jhv0m"; + sha256 = "1z1m6dxh2i5vsnkzaccb9j02ab05wgmcgig5d0l9w856g5jp3zmy"; fetchSubmodules = true; }; @@ -50,7 +51,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - cairo libXdmcp libpthreadstubs libxcb pcre python2 xcbproto xcbutil + cairo libXdmcp libpthreadstubs libxcb pcre python3 xcbproto-py3 xcbutil xcbutilcursor xcbutilimage xcbutilrenderutil xcbutilwm xcbutilxrm (if alsaSupport then alsaLib else null) -- cgit 1.4.1