Merge pull request #170259 from armeenm/bump-wmii
commit
34c7bd6d18
@ -1,46 +0,0 @@ |
||||
{ lib, stdenv, fetchurl, unzip, pkg-config, libixp_hg, txt2tags, dash, python2, which |
||||
, libX11 , libXrender, libXext, libXinerama, libXrandr, libXft }: |
||||
|
||||
stdenv.mkDerivation rec { |
||||
rev = "2823"; |
||||
version = "hg-2012-12-09"; |
||||
pname = "wmii"; |
||||
|
||||
src = fetchurl { |
||||
url = "https://storage.googleapis.com/google-code-archive-source/v2/code.google.com/wmii/source-archive.zip"; |
||||
sha256 = "1wmkq14zvmfrmydl8752xz852cy7agrx3qp4fy2cc5asb2r9abaz"; |
||||
}; |
||||
|
||||
# for dlopen-ing |
||||
patchPhase = '' |
||||
substituteInPlace lib/libstuff/x11/xft.c --replace "libXft.so" "$(pkg-config --variable=libdir xft)/libXft.so.2" |
||||
substituteInPlace cmd/wmii.sh.sh --replace "\$(which which)" "${which}/bin/which" |
||||
''; |
||||
|
||||
configurePhase = '' |
||||
for file in $(grep -lr '#!.*sh'); do |
||||
sed -i 's|#!.*sh|#!${dash}/bin/dash|' $file |
||||
done |
||||
|
||||
cat <<EOF >> config.mk |
||||
PREFIX = $out |
||||
LIBIXP = ${libixp_hg}/lib/libixp.a |
||||
BINSH = ${dash}/bin/dash |
||||
EOF |
||||
''; |
||||
|
||||
nativeBuildInputs = [ pkg-config unzip ]; |
||||
buildInputs = [ libixp_hg txt2tags dash python2 which |
||||
libX11 libXrender libXext libXinerama libXrandr libXft ]; |
||||
|
||||
# For some reason including mercurial in buildInputs did not help |
||||
makeFlags = [ "WMII_HGVERSION=hg${rev}" ]; |
||||
|
||||
meta = { |
||||
homepage = "https://suckless.org/"; # https://wmii.suckless.org/ does not exist anymore |
||||
description = "A small window manager controlled by a 9P filesystem"; |
||||
maintainers = with lib.maintainers; [ kovirobi ]; |
||||
license = lib.licenses.mit; |
||||
platforms = with lib.platforms; linux; |
||||
}; |
||||
} |
@ -0,0 +1,72 @@ |
||||
{ lib, stdenv |
||||
, fetchFromGitHub |
||||
, dash |
||||
, libX11 |
||||
, libXext |
||||
, libXft |
||||
, libXinerama |
||||
, libXrandr |
||||
, libXrender |
||||
, libixp |
||||
, pkg-config |
||||
, txt2tags |
||||
, unzip |
||||
, which |
||||
}: |
||||
|
||||
stdenv.mkDerivation rec { |
||||
pname = "wmii"; |
||||
version = "unstable-2022-04-04"; |
||||
|
||||
src = fetchFromGitHub { |
||||
owner = "0intro"; |
||||
repo = "wmii"; |
||||
rev = "ff120c7fee6e1b3a30a4a800074394327fb1da9d"; |
||||
hash = "sha256-KEmWnobpT/5TdgT2HGPCpG1duz9Q6Z6PFSEBs2Ce+7g="; |
||||
}; |
||||
|
||||
# for dlopen-ing |
||||
postPatch = '' |
||||
substituteInPlace lib/libstuff/x11/xft.c --replace "libXft.so" "$(pkg-config --variable=libdir xft)/libXft.so.2" |
||||
substituteInPlace cmd/wmii.sh.sh --replace "\$(which which)" "${which}/bin/which" |
||||
''; |
||||
|
||||
postConfigure = '' |
||||
for file in $(grep -lr '#!.*sh'); do |
||||
sed -i 's|#!.*sh|#!${dash}/bin/dash|' $file |
||||
done |
||||
|
||||
cat <<EOF >> config.mk |
||||
PREFIX = $out |
||||
LIBIXP = ${libixp}/lib/libixp.a |
||||
BINSH = ${dash}/bin/dash |
||||
EOF |
||||
''; |
||||
|
||||
# Remove optional python2 functionality |
||||
postInstall = '' |
||||
rm -rf $out/lib/python* $out/etc/wmii-hg/python |
||||
''; |
||||
|
||||
nativeBuildInputs = [ pkg-config unzip ]; |
||||
buildInputs = [ |
||||
dash |
||||
libX11 |
||||
libXext |
||||
libXft |
||||
libXinerama |
||||
libXrandr |
||||
libXrender |
||||
libixp |
||||
txt2tags |
||||
which |
||||
]; |
||||
|
||||
meta = { |
||||
homepage = "https://github.com/0intro/wmii"; |
||||
description = "A small, scriptable window manager, with a 9P filesystem interface and an acme-like layout"; |
||||
maintainers = with lib.maintainers; [ kovirobi ]; |
||||
license = lib.licenses.mit; |
||||
platforms = with lib.platforms; linux; |
||||
}; |
||||
} |
@ -1,27 +0,0 @@ |
||||
{ lib, stdenv, fetchurl, unzip, txt2tags }: |
||||
|
||||
stdenv.mkDerivation rec { |
||||
rev = "148"; |
||||
version = "hg-2012-12-02"; |
||||
pname = "libixp"; |
||||
|
||||
src = fetchurl { |
||||
url = "https://storage.googleapis.com/google-code-archive-source/v2/code.google.com/libixp/source-archive.zip"; |
||||
sha256 = "0kcdvdcrkw6q39v563ncis6d7ini64xbgn5fd3b4aa95fp9sj3is"; |
||||
}; |
||||
|
||||
configurePhase = '' |
||||
sed -i -e "s|^PREFIX.*=.*$|PREFIX = $out|" config.mk |
||||
''; |
||||
|
||||
nativeBuildInputs = [ unzip ]; |
||||
buildInputs = [ txt2tags ]; |
||||
|
||||
meta = { |
||||
homepage = "http://repo.cat-v.org/libixp/"; # see also https://libs.suckless.org/deprecated/libixp |
||||
description = "Portable, simple C-language 9P client and server libary"; |
||||
maintainers = with lib.maintainers; [ kovirobi ]; |
||||
license = lib.licenses.mit; |
||||
platforms = with lib.platforms; unix; |
||||
}; |
||||
} |
@ -0,0 +1,28 @@ |
||||
{ lib, stdenv, fetchFromGitHub, unzip, txt2tags }: |
||||
|
||||
stdenv.mkDerivation rec { |
||||
pname = "libixp"; |
||||
version = "unstable-2022-04-04"; |
||||
|
||||
src = fetchFromGitHub { |
||||
owner = "0intro"; |
||||
repo = "libixp"; |
||||
rev = "ca2acb2988e4f040022f0e2094c69ab65fa6ec53"; |
||||
hash = "sha256-S25DmXJ7fN0gXLV0IzUdz8hXPTYEHmaSG7Mnli6GQVc="; |
||||
}; |
||||
|
||||
postConfigure = '' |
||||
sed -i -e "s|^PREFIX.*=.*$|PREFIX = $out|" config.mk |
||||
''; |
||||
|
||||
nativeBuildInputs = [ unzip ]; |
||||
buildInputs = [ txt2tags ]; |
||||
|
||||
meta = { |
||||
homepage = "https://github.com/0intro/libixp"; |
||||
description = "Portable, simple C-language 9P client and server libary"; |
||||
maintainers = with lib.maintainers; [ kovirobi ]; |
||||
license = lib.licenses.mit; |
||||
platforms = with lib.platforms; unix; |
||||
}; |
||||
} |
Loading…
Reference in new issue