forked from mirrors/nixpkgs
Merge pull request #63195 from gnidorah/wlc
Drop obsolete Wayland compositors
This commit is contained in:
Michael Weiss
GitHub
commit
5f9145d56c
|
|
@ -1,26 +0,0 @@
|
|||
{ stdenv, fetchFromGitHub, cmake, pkgconfig
|
||||
, pango, wayland, libxkbcommon }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "bemenu-2017-02-14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Cloudef";
|
||||
repo = "bemenu";
|
||||
rev = "d6261274cf0b3aa51ce8ea7418a79495b20ad558";
|
||||
sha256 = "08bc623y5yjbz7q83lhl6rb0xs6ji17z79c260bx0fgin8sfj5x8";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkgconfig ];
|
||||
|
||||
buildInputs = [ pango wayland libxkbcommon ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A dynamic menu library and client program inspired by dmenu";
|
||||
homepage = src.meta.homepage;
|
||||
license = with licenses; [ gpl3 lgpl3 ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,41 +0,0 @@
|
|||
{ lib, stdenv, fetchgit, cmake, pkgconfig, makeWrapper, callPackage
|
||||
, wlc, dbus, wayland, libxkbcommon, pixman, libinput, udev, zlib, libpng
|
||||
, libdrm, libX11
|
||||
, westonLite
|
||||
}:
|
||||
|
||||
let
|
||||
bemenu = callPackage ./bemenu.nix {};
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "orbment-${version}";
|
||||
version = "git-2016-08-13";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/Cloudef/orbment";
|
||||
rev = "01dcfff9719e20261a6d8c761c0cc2f8fa0d0de5";
|
||||
sha256 = "04mv9nh847vijr01zrs47fzmnwfhdx09vi3ddv843mx10yx7lqdb";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkgconfig makeWrapper ];
|
||||
|
||||
buildInputs = [
|
||||
wlc dbus wayland libxkbcommon pixman libinput udev zlib libpng libX11
|
||||
libdrm
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/orbment \
|
||||
--prefix PATH : "${stdenv.lib.makeBinPath [ bemenu westonLite ]}"
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
description = "Modular Wayland compositor";
|
||||
homepage = src.url;
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,59 +0,0 @@
|
|||
{ lib, stdenv, fetchFromGitHub, pkgconfig, makeWrapper, newScope
|
||||
, libxkbcommon
|
||||
, wayland, pixman, fontconfig
|
||||
, stConf ? null, stPatches ? []
|
||||
}:
|
||||
|
||||
let
|
||||
callPackage = newScope self;
|
||||
self = {
|
||||
swc = callPackage ./swc.nix {};
|
||||
wld = callPackage ./wld.nix {};
|
||||
dmenu-velox = callPackage ./dmenu.nix {};
|
||||
st-velox = callPackage ./st.nix {
|
||||
conf = stConf;
|
||||
patches = stPatches;
|
||||
};
|
||||
};
|
||||
in with self; stdenv.mkDerivation rec {
|
||||
name = "velox-${version}";
|
||||
version = "git-2017-07-04";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "michaelforney";
|
||||
repo = "velox";
|
||||
rev = "0b1d3d62861653d92d0a1056855a84fcef661bc0";
|
||||
sha256 = "0p5ra5p5w21wl696rmv0vdnl7jnri5iwnxfs6nl6miwydhq2dmci";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig makeWrapper ];
|
||||
|
||||
buildInputs = [ swc libxkbcommon wld wayland pixman fontconfig ];
|
||||
|
||||
propagatedUserEnvPkgs = [ swc ];
|
||||
|
||||
makeFlags = "PREFIX=$(out)";
|
||||
preBuild = ''
|
||||
substituteInPlace config.c \
|
||||
--replace /etc/velox.conf $out/etc/velox.conf
|
||||
'';
|
||||
installPhase = ''
|
||||
PREFIX=$out make install
|
||||
mkdir -p $out/etc
|
||||
cp velox.conf.sample $out/etc/velox.conf
|
||||
'';
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/velox \
|
||||
--prefix PATH : "${stdenv.lib.makeBinPath [ dmenu-velox st-velox ]}"
|
||||
'';
|
||||
|
||||
enableParallelBuilding = false; # https://hydra.nixos.org/build/79799608
|
||||
|
||||
meta = {
|
||||
description = "velox window manager";
|
||||
homepage = "https://github.com/michaelforney/velox";
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,37 +0,0 @@
|
|||
{stdenv, fetchFromGitHub #, libX11, libXinerama, enableXft, libXft, zlib
|
||||
, swc, wld, wayland, libxkbcommon, pixman, fontconfig
|
||||
}:
|
||||
|
||||
with stdenv.lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "dmenu-velox-${version}";
|
||||
version = "git-2017-04-07";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "michaelforney";
|
||||
repo = "dmenu";
|
||||
rev = "f385d9d18813071b4b4257bf8d4d572daeda0e70";
|
||||
sha256 = "14j8jv0nlybinhzkgd6dplvng9zy8p292prlx39w0k4fm6x5nv6y";
|
||||
};
|
||||
|
||||
buildInputs = [ swc wld wayland libxkbcommon pixman fontconfig ];
|
||||
|
||||
postPatch = ''
|
||||
sed -ri -e 's!\<(dmenu|dmenu_path)\>!'"$out/bin"'/&!g' dmenu_run
|
||||
'';
|
||||
|
||||
preConfigure = [
|
||||
''sed -i "s@PREFIX = /usr/local@PREFIX = $out@g; s@/usr/share/swc@${swc}/share/swc@g" config.mk''
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
description = "A generic, highly customizable, and efficient menu for the X Window System";
|
||||
homepage = https://tools.suckless.org/dmenu;
|
||||
license = stdenv.lib.licenses.mit;
|
||||
maintainers = with stdenv.lib.maintainers; [ ];
|
||||
platforms = with stdenv.lib.platforms; all;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,40 +0,0 @@
|
|||
{ stdenv, fetchFromGitHub, pkgconfig, writeText
|
||||
, ncurses, wayland, wayland-protocols, wld, libxkbcommon, fontconfig, pixman
|
||||
, conf, patches }:
|
||||
|
||||
with stdenv.lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "st-velox-${version}";
|
||||
version = "git-2016-12-22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "michaelforney";
|
||||
repo = "st";
|
||||
rev = "b27f17da65f74b0a923952601873524e03b4d047";
|
||||
sha256 = "17aa4bz5g14jvqghk2c8mw77hb8786s07pv814rmlk7nnsavmp3i";
|
||||
};
|
||||
|
||||
inherit patches;
|
||||
|
||||
configFile = optionalString (conf!=null) (writeText "config.def.h" conf);
|
||||
preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h";
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [ ncurses wayland wayland-protocols wld libxkbcommon fontconfig pixman ];
|
||||
|
||||
NIX_LDFLAGS = "-lfontconfig";
|
||||
|
||||
installPhase = ''
|
||||
TERMINFO=$out/share/terminfo make install PREFIX=$out
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
homepage = https://st.suckless.org/;
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = with platforms; linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,36 +0,0 @@
|
|||
{ lib, stdenv, fetchFromGitHub, pkgconfig
|
||||
, wld, wayland, wayland-protocols, fontconfig, pixman, libdrm, libinput, libevdev, libxkbcommon, libxcb, xcbutilwm
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "swc-${version}";
|
||||
version = "git-2017-06-28";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "michaelforney";
|
||||
repo = "swc";
|
||||
rev = "5b20050872f8ad29cfc97729f8af47b6b3df5393";
|
||||
sha256 = "1lxpm17v5d8png6ixc0zn0w00xgrhz2n5b8by9vx6800b18246z8";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
buildInputs = [ wld wayland wayland-protocols fontconfig pixman libdrm libinput libevdev libxkbcommon libxcb xcbutilwm ];
|
||||
|
||||
prePatch = ''
|
||||
substituteInPlace launch/local.mk --replace 4755 755
|
||||
'';
|
||||
|
||||
makeFlags = "PREFIX=$(out)";
|
||||
installPhase = "PREFIX=$out make install";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
description = "A library for making a simple Wayland compositor";
|
||||
homepage = src.meta.homepage;
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,32 +0,0 @@
|
|||
{ lib, stdenv, fetchFromGitHub, pkgconfig
|
||||
, wayland, fontconfig, pixman, freetype, libdrm
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "wld-${version}";
|
||||
version = "git-2017-10-31";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "michaelforney";
|
||||
repo = "wld";
|
||||
rev = "b4e902bbecb678c45485b52c3aa183cbc932c595";
|
||||
sha256 = "0j2n776flnzyw3vhxl0r8h1c48wrihi4g6bs2z8j4hbw5pnwq1k6";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
buildInputs = [ wayland fontconfig pixman freetype libdrm ];
|
||||
|
||||
makeFlags = "PREFIX=$(out)";
|
||||
installPhase = "PREFIX=$out make install";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
description = "A primitive drawing library targeted at Wayland";
|
||||
homepage = src.meta.homepage;
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,8 +1,10 @@
|
|||
{ stdenv, fetchurl, makeWrapper, symlinkJoin, writeShellScriptBin, callPackage, defaultCrateOverrides
|
||||
, wayland, wlc, cairo, libxkbcommon, pam, python3Packages, lemonbar, gdk_pixbuf
|
||||
, wayland, cairo, libxkbcommon, pam, python3Packages, lemonbar, gdk_pixbuf
|
||||
}:
|
||||
|
||||
let
|
||||
wlc = callPackage ./wlc.nix {};
|
||||
|
||||
# refer to
|
||||
# https://github.com/way-cooler/way-cooler.github.io/blob/master/way-cooler-release-i3-default.sh
|
||||
# for version numbers
|
||||
|
|
|
|||
|
|
@ -18575,11 +18575,8 @@ in
|
|||
|
||||
super-productivity = callPackage ../applications/networking/super-productivity { };
|
||||
|
||||
wlc = callPackage ../development/libraries/wlc { };
|
||||
wlroots = callPackage ../development/libraries/wlroots { };
|
||||
|
||||
orbment = callPackage ../applications/window-managers/orbment { };
|
||||
|
||||
sway = callPackage ../applications/window-managers/sway { };
|
||||
swaybg = callPackage ../applications/window-managers/sway/bg.nix { };
|
||||
swayidle = callPackage ../applications/window-managers/sway/idle.nix { };
|
||||
|
|
@ -18589,11 +18586,6 @@ in
|
|||
pulseSupport = config.pulseaudio or false;
|
||||
};
|
||||
|
||||
velox = callPackage ../applications/window-managers/velox {
|
||||
stConf = config.st.conf or null;
|
||||
stPatches = config.st.patches or null;
|
||||
};
|
||||
|
||||
i3 = callPackage ../applications/window-managers/i3 {
|
||||
xcb-util-cursor = if stdenv.isDarwin then xcb-util-cursor-HEAD else xcb-util-cursor;
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in a new issue