stumpwm: redirect to lispPackages.stumpwm; stumpwm-git: drop
This commit is contained in:
parent
2079edc748
commit
10854c5a4d
|
@ -1,103 +0,0 @@
|
|||
{ lib, stdenv, fetchgit, autoconf, sbcl, lispPackages, xdpyinfo, texinfo4
|
||||
, makeWrapper , rlwrap, gnused, gnugrep, coreutils, xprop
|
||||
, extraModulePaths ? []
|
||||
, version }:
|
||||
|
||||
let
|
||||
contrib = (fetchgit {
|
||||
url = "https://github.com/stumpwm/stumpwm-contrib.git";
|
||||
rev = "9bebe3622b2b6c31a6bada9055ef3862fa79b86f";
|
||||
sha256 = "1ml6mjk2fsfv4sf65fdbji3q5x0qiq99g1k8w7a99gsl2i8h60gc";
|
||||
});
|
||||
versionSpec = {
|
||||
latest = {
|
||||
name = "1.0.0";
|
||||
rev = "refs/tags/1.0.0";
|
||||
sha256 = "16r0lwhxl8g71masmfbjr7s7m7fah4ii4smi1g8zpbpiqjz48ryb";
|
||||
patches = [];
|
||||
};
|
||||
"0.9.9" = {
|
||||
name = "0.9.9";
|
||||
rev = "refs/tags/0.9.9";
|
||||
sha256 = "0hmvbdk2yr5wrkiwn9dfzf65s4xc2qifj0sn6w2mghzp96cph79k";
|
||||
patches = [ ./fix-module-path.patch ];
|
||||
};
|
||||
git = {
|
||||
name = "git-20170203";
|
||||
rev = "d20f24e58ab62afceae2afb6262ffef3cc318b97";
|
||||
sha256 = "1gi29ds1x6dq7lz8lamnhcvcrr3cvvrg5yappfkggyhyvib1ii70";
|
||||
patches = [];
|
||||
};
|
||||
}.${version};
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "stumpwm-${versionSpec.name}";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/stumpwm/stumpwm";
|
||||
rev = versionSpec.rev;
|
||||
sha256 = versionSpec.sha256;
|
||||
};
|
||||
|
||||
# NOTE: The patch needs an update for the next release.
|
||||
# `(stumpwm:set-module-dir "@MODULE_DIR@")' needs to be in it.
|
||||
patches = versionSpec.patches;
|
||||
|
||||
buildInputs = [
|
||||
texinfo4 makeWrapper autoconf
|
||||
sbcl
|
||||
lispPackages.clx
|
||||
lispPackages.cl-ppcre
|
||||
lispPackages.alexandria
|
||||
xdpyinfo
|
||||
];
|
||||
|
||||
|
||||
# Stripping destroys the generated SBCL image
|
||||
dontStrip = true;
|
||||
|
||||
configurePhase = ''
|
||||
./autogen.sh
|
||||
./configure --prefix=$out --with-module-dir=$out/share/stumpwm/modules
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
cp -r --no-preserve=mode ${contrib} modules
|
||||
substituteInPlace head.lisp \
|
||||
--replace 'run-shell-command "xdpyinfo' 'run-shell-command "${xdpyinfo}/bin/xdpyinfo'
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -pv $out/bin
|
||||
make install
|
||||
|
||||
mkdir -p $out/share/stumpwm/modules
|
||||
cp -r modules/* $out/share/stumpwm/modules/
|
||||
for d in ${lib.concatStringsSep " " extraModulePaths}; do
|
||||
cp -r --no-preserve=mode "$d" $out/share/stumpwm/modules/
|
||||
done
|
||||
|
||||
# Copy stumpish;
|
||||
cp $out/share/stumpwm/modules/util/stumpish/stumpish $out/bin/
|
||||
chmod +x $out/bin/stumpish
|
||||
wrapProgram $out/bin/stumpish \
|
||||
--prefix PATH ":" "${lib.makeBinPath [ rlwrap gnused gnugrep coreutils xprop ]}"
|
||||
|
||||
# Paths in the compressed image $out/bin/stumpwm are not
|
||||
# recognized by Nix. Add explicit reference here.
|
||||
mkdir $out/nix-support
|
||||
echo ${xdpyinfo} > $out/nix-support/xdpyinfo
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
inherit sbcl lispPackages contrib;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "A tiling window manager for X11";
|
||||
homepage = "https://github.com/stumpwm/";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
broken = true; # 2018-04-11
|
||||
};
|
||||
}
|
|
@ -1,16 +0,0 @@
|
|||
diff --git a/make-image.lisp.in b/make-image.lisp.in
|
||||
index 121e9d6..2210242 100644
|
||||
--- a/make-image.lisp.in
|
||||
+++ b/make-image.lisp.in
|
||||
@@ -2,7 +2,10 @@
|
||||
|
||||
(load "load-stumpwm.lisp")
|
||||
|
||||
-#-ecl (stumpwm:set-module-dir "@CONTRIB_DIR@")
|
||||
+(setf asdf::*immutable-systems*
|
||||
+ (uiop:list-to-hash-set (asdf:already-loaded-systems)))
|
||||
+
|
||||
+#-ecl (stumpwm:set-module-dir "@MODULE_DIR@")
|
||||
|
||||
#+sbcl
|
||||
(sb-ext:save-lisp-and-die "stumpwm" :toplevel (lambda ()
|
|
@ -759,6 +759,7 @@ mapAliases ({
|
|||
squid4 = squid; # added 2019-08-22
|
||||
sshfsFuse = sshfs-fuse; # added 2016-09
|
||||
stanchion = throw "Stanchion was part of riak-cs which is not maintained anymore"; # added 2020-10-14
|
||||
stumpwm-git = throw "stumpwm-git has been broken for a long time and lispPackages.stumpwm follows Quicklisp that is close to git version"; # added 2021-05-09
|
||||
surf-webkit2 = surf; # added 2017-04-02
|
||||
sup = throw "sup was deprecated on 2019-09-10: abandoned by upstream";
|
||||
swfdec = throw "swfdec has been removed as broken and unmaintained."; # added 2020-08-23
|
||||
|
|
|
@ -26192,14 +26192,7 @@ in
|
|||
|
||||
stumpish = callPackage ../applications/window-managers/stumpish {};
|
||||
|
||||
stumpwm = callPackage ../applications/window-managers/stumpwm {
|
||||
version = "latest";
|
||||
};
|
||||
|
||||
stumpwm-git = stumpwm.override {
|
||||
version = "git";
|
||||
inherit sbcl lispPackages;
|
||||
};
|
||||
stumpwm = lispPackages.stumpwm;
|
||||
|
||||
sublime = callPackage ../applications/editors/sublime/2 { };
|
||||
|
||||
|
|
Loading…
Reference in a new issue