wmii: fix build by disabling python building

(cherry picked from commit 1d9a56234f)
This commit is contained in:
Noa Aarts 2024-11-13 21:53:04 +01:00 committed by github-actions[bot]
parent b5b65f013a
commit eda08ed89e
2 changed files with 22 additions and 7 deletions

View File

@ -0,0 +1,14 @@
diff --git a/alternative_wmiircs/Makefile b/alternative_wmiircs/Makefile
index 3b9c3709..3ce46169 100644
--- a/alternative_wmiircs/Makefile
+++ b/alternative_wmiircs/Makefile
@@ -3,8 +3,7 @@ include $(ROOT)/mk/hdr.mk
include $(ROOT)/mk/wmii.mk
BIN = $(GLOBALCONF)
-DIRS = python \
- plan9port \
+DIRS = plan9port \
ruby
DOCS = README

View File

@ -18,13 +18,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "wmii"; pname = "wmii";
version = "unstable-2022-04-04"; version = "0-unstable-2023-09-30";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "0intro"; owner = "0intro";
repo = "wmii"; repo = "wmii";
rev = "ff120c7fee6e1b3a30a4a800074394327fb1da9d"; rev = "26848c93457606b350f57d6d313112a745a0cf3d";
hash = "sha256-KEmWnobpT/5TdgT2HGPCpG1duz9Q6Z6PFSEBs2Ce+7g="; hash = "sha256-5l2aYAoThbA0Aq8M2vPTzaocQO1AvrnWqgXhmBLADVk=";
}; };
# for dlopen-ing # for dlopen-ing
@ -45,10 +45,11 @@ stdenv.mkDerivation rec {
EOF EOF
''; '';
# Remove optional python2 functionality patches = [
postInstall = '' # the python alternative wmiirc was not building due to errors with pyxp
rm -rf $out/lib/python* $out/etc/wmii-hg/python # this patch disables building it altogether
''; ./001-disable-python2-build.patch
];
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config