From fe57668bca7864c44c948ce209dfaf4a1180759b Mon Sep 17 00:00:00 2001 From: itslychee Date: Sun, 24 Mar 2024 07:25:38 -0500 Subject: [PATCH 1/2] pythonPackages.jishaku: patch hardcoded /bin/bash default to /bin/sh Co-Authored-By: a-n-n-a-l-e-e --- pkgs/development/python-modules/jishaku/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/jishaku/default.nix b/pkgs/development/python-modules/jishaku/default.nix index e758f4c691eb..a5bf87fbdd4a 100644 --- a/pkgs/development/python-modules/jishaku/default.nix +++ b/pkgs/development/python-modules/jishaku/default.nix @@ -1,5 +1,6 @@ { lib, + bash, buildPythonPackage, fetchFromGitHub, fetchpatch, @@ -33,6 +34,11 @@ buildPythonPackage rec { }) ]; + postPatch = '' + substituteInPlace jishaku/shell.py \ + --replace-fail '"/bin/bash"' '"${lib.getExe bash}"' + ''; + nativeBuildInputs = [ setuptools ]; propagatedBuildInputs = [ From 8b3d5801867c185d5eb51cc2dcaeed11bb63afde Mon Sep 17 00:00:00 2001 From: itslychee Date: Sun, 24 Mar 2024 07:42:37 -0500 Subject: [PATCH 2/2] pythonPackages.jishaku: update attributes Uses the recent `build-system` and `dependencies` changes made to the python wrapper for clarity. --- pkgs/development/python-modules/jishaku/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jishaku/default.nix b/pkgs/development/python-modules/jishaku/default.nix index a5bf87fbdd4a..4501ffc68e6b 100644 --- a/pkgs/development/python-modules/jishaku/default.nix +++ b/pkgs/development/python-modules/jishaku/default.nix @@ -39,9 +39,9 @@ buildPythonPackage rec { --replace-fail '"/bin/bash"' '"${lib.getExe bash}"' ''; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ discordpy click braceexpand