diff options
author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-03-31 23:50:44 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-03-31 23:50:44 +0200 |
commit | 543340dee3f7623427f783949e98657e91c9109d (patch) | |
tree | 5b20893fd964ae2992d18c2f42739fd6e8614e9b /pkgs/applications/window-managers | |
parent | a59657b42d7b9e52a141c678ee971e0d556a8cb2 (diff) | |
parent | b5b4992ef96b5ef4f441dccd8252f6783c7b8ac9 (diff) |
Merge pull request #300533 from atorres1985-contrib/fvwm
Fvwm: refactor and migrate to by-name
Diffstat (limited to 'pkgs/applications/window-managers')
-rw-r--r-- | pkgs/applications/window-managers/fvwm/2.6.nix | 82 | ||||
-rw-r--r-- | pkgs/applications/window-managers/fvwm/3.nix | 97 |
2 files changed, 0 insertions, 179 deletions
diff --git a/pkgs/applications/window-managers/fvwm/2.6.nix b/pkgs/applications/window-managers/fvwm/2.6.nix deleted file mode 100644 index e771a170c4894..0000000000000 --- a/pkgs/applications/window-managers/fvwm/2.6.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, autoreconfHook -, cairo -, fontconfig -, freetype -, fribidi -, libXcursor -, libXft -, libXinerama -, libXpm -, libXt -, libpng -, librsvg -, libstroke -, libxslt -, perl -, pkg-config -, python3Packages -, readline -, enableGestures ? false -}: - -stdenv.mkDerivation rec { - pname = "fvwm"; - version = "2.7.0"; - - src = fetchFromGitHub { - owner = "fvwmorg"; - repo = pname; - rev = version; - hash = "sha256-KcuX8las1n8UUE/BOHj7WOeZjva5hxgpFHtATMUk3bg="; - }; - - nativeBuildInputs = [ - autoreconfHook - pkg-config - python3Packages.wrapPython - ]; - - buildInputs = [ - cairo - fontconfig - freetype - fribidi - libXcursor - libXft - libXinerama - libXpm - libXt - libpng - librsvg - libxslt - perl - python3Packages.python - readline - ] ++ lib.optional enableGestures libstroke; - - pythonPath = [ - python3Packages.pyxdg - ]; - - configureFlags = [ - "--enable-mandoc" - "--disable-htmldoc" - ]; - - postFixup = '' - wrapPythonPrograms - ''; - - enableParallelBuilding = true; - - meta = with lib; { - homepage = "http://fvwm.org"; - description = "A multiple large virtual desktop window manager"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ edanaher ]; - }; -} diff --git a/pkgs/applications/window-managers/fvwm/3.nix b/pkgs/applications/window-managers/fvwm/3.nix deleted file mode 100644 index 83dffa0200081..0000000000000 --- a/pkgs/applications/window-managers/fvwm/3.nix +++ /dev/null @@ -1,97 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, asciidoctor -, autoreconfHook -, cairo -, fontconfig -, freetype -, fribidi -, libSM -, libX11 -, libXcursor -, libXft -, libXi -, libXinerama -, libXpm -, libXrandr -, libXt -, libevent -, libintl -, libpng -, librsvg -, libstroke -, libxslt -, perl -, pkg-config -, python3Packages -, readline -, sharutils -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "fvwm3"; - version = "1.1.0"; - - src = fetchFromGitHub { - owner = "fvwmorg"; - repo = "fvwm3"; - rev = finalAttrs.version; - hash = "sha256-y1buTWO1vHzloh2e4EK1dkD0uQa7lIFUbNMkEe5x6Vo="; - }; - - nativeBuildInputs = [ - autoreconfHook - asciidoctor - pkg-config - python3Packages.wrapPython - ]; - - buildInputs = [ - cairo - fontconfig - freetype - fribidi - libSM - libX11 - libXcursor - libXft - libXi - libXinerama - libXpm - libXrandr - libXt - libevent - libintl - libpng - librsvg - libstroke - libxslt - perl - python3Packages.python - readline - sharutils - ]; - - pythonPath = [ - python3Packages.pyxdg - ]; - - configureFlags = [ - "--enable-mandoc" - ]; - - postFixup = '' - wrapPythonPrograms - ''; - - enableParallelBuilding = true; - - meta = with lib; { - homepage = "http://fvwm.org"; - description = "A multiple large virtual desktop window manager - Version 3"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ AndersonTorres ]; - inherit (libX11.meta) platforms; - }; -}) |