From 01cf96d087e9e890acaa4d11bf21d9b52396bbfb Mon Sep 17 00:00:00 2001 From: Michael Francis Date: Wed, 10 Feb 2021 05:04:05 +0800 Subject: [PATCH 1/2] Fix powerline 2.8 to build on OSX --- pkgs/development/python-modules/powerline/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/powerline/default.nix b/pkgs/development/python-modules/powerline/default.nix index 5834dd760369..27f598489c2b 100644 --- a/pkgs/development/python-modules/powerline/default.nix +++ b/pkgs/development/python-modules/powerline/default.nix @@ -8,6 +8,7 @@ , pygit2 , pyuv , i3ipc +, stdenv }: # TODO: bzr support is missing because nixpkgs switched to `breezy` @@ -29,8 +30,7 @@ buildPythonPackage rec { hglib pygit2 pyuv - i3ipc - ]; + ] ++ lib.optionals (!stdenv.isDarwin) i3ipc; # tests are travis-specific doCheck = false; From 5c53c07528c3eb1d357e1ee707f68873681f546d Mon Sep 17 00:00:00 2001 From: Michael Francis Date: Tue, 9 Feb 2021 17:25:38 -0500 Subject: [PATCH 2/2] Update pkgs/development/python-modules/powerline/default.nix Co-authored-by: Sandro --- pkgs/development/python-modules/powerline/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/powerline/default.nix b/pkgs/development/python-modules/powerline/default.nix index 27f598489c2b..1ad17d0459dd 100644 --- a/pkgs/development/python-modules/powerline/default.nix +++ b/pkgs/development/python-modules/powerline/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { hglib pygit2 pyuv - ] ++ lib.optionals (!stdenv.isDarwin) i3ipc; + ] ++ lib.optionals (!stdenv.isDarwin) [ i3ipc ]; # tests are travis-specific doCheck = false;