From bc849619be4408d6dd3d953d421c72abac432e8e Mon Sep 17 00:00:00 2001 From: gnidorah Date: Sun, 16 Jun 2019 12:43:19 +0300 Subject: [PATCH] velox: remove obsoleted package --- .../window-managers/velox/default.nix | 59 ------------------- .../window-managers/velox/dmenu.nix | 37 ------------ .../applications/window-managers/velox/st.nix | 40 ------------- .../window-managers/velox/swc.nix | 36 ----------- .../window-managers/velox/wld.nix | 32 ---------- pkgs/top-level/all-packages.nix | 5 -- 6 files changed, 209 deletions(-) delete mode 100644 pkgs/applications/window-managers/velox/default.nix delete mode 100644 pkgs/applications/window-managers/velox/dmenu.nix delete mode 100644 pkgs/applications/window-managers/velox/st.nix delete mode 100644 pkgs/applications/window-managers/velox/swc.nix delete mode 100644 pkgs/applications/window-managers/velox/wld.nix diff --git a/pkgs/applications/window-managers/velox/default.nix b/pkgs/applications/window-managers/velox/default.nix deleted file mode 100644 index f8cb6c266839..000000000000 --- a/pkgs/applications/window-managers/velox/default.nix +++ /dev/null @@ -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; [ ]; - }; -} diff --git a/pkgs/applications/window-managers/velox/dmenu.nix b/pkgs/applications/window-managers/velox/dmenu.nix deleted file mode 100644 index 01360e5af0b3..000000000000 --- a/pkgs/applications/window-managers/velox/dmenu.nix +++ /dev/null @@ -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; - }; -} diff --git a/pkgs/applications/window-managers/velox/st.nix b/pkgs/applications/window-managers/velox/st.nix deleted file mode 100644 index 2d73df650463..000000000000 --- a/pkgs/applications/window-managers/velox/st.nix +++ /dev/null @@ -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; - }; -} diff --git a/pkgs/applications/window-managers/velox/swc.nix b/pkgs/applications/window-managers/velox/swc.nix deleted file mode 100644 index a2f98b8b65e7..000000000000 --- a/pkgs/applications/window-managers/velox/swc.nix +++ /dev/null @@ -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; [ ]; - }; -} diff --git a/pkgs/applications/window-managers/velox/wld.nix b/pkgs/applications/window-managers/velox/wld.nix deleted file mode 100644 index d85f8212ec47..000000000000 --- a/pkgs/applications/window-managers/velox/wld.nix +++ /dev/null @@ -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; [ ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e3d98b492754..05d53d3f8114 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18448,11 +18448,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; };