Unverified Commit a34e3f29 authored by Anderson Torres's avatar Anderson Torres Committed by GitHub
Browse files

Merge pull request #183209 from AndersonTorres/nscde 

fvwm3: init at 1.0.4
parents c974a9fc bef8e4df

nixos/modules/services/x11/window-managers/default.nix

+2 −1
Original line number Diff line number Diff line
@@ -19,7 +19,8 @@ in 
    ./evilwm.nix

    ./exwm.nix

    ./fluxbox.nix

    ./fvwm.nix

    ./fvwm2.nix

    ./fvwm3.nix

    ./herbstluftwm.nix

    ./i3.nix

    ./jwm.nix

nixos/modules/services/x11/window-managers/fvwm.nix→nixos/modules/services/x11/window-managers/fvwm2.nix

+47 −0
Original line number Diff line number Diff line
@@ -3,17 +3,23 @@ 
with lib;



let

  cfg = config.services.xserver.windowManager.fvwm;

  fvwm = pkgs.fvwm.override { enableGestures = cfg.gestures; };

  cfg = config.services.xserver.windowManager.fvwm2;

  fvwm2 = pkgs.fvwm2.override { enableGestures = cfg.gestures; };

in



{



  imports = [

    (mkRenamedOptionModule

      [ "services" "xserver" "windowManager" "fvwm" ]

      [ "services" "xserver" "windowManager" "fvwm2" ])

  ];



  ###### interface



  options = {

    services.xserver.windowManager.fvwm = {

      enable = mkEnableOption "Fvwm window manager";

    services.xserver.windowManager.fvwm2 = {

      enable = mkEnableOption "Fvwm2 window manager";



      gestures = mkOption {

        default = false;
@@ -28,14 +34,14 @@ in 


  config = mkIf cfg.enable {

    services.xserver.windowManager.session = singleton

      { name = "fvwm";

      { name = "fvwm2";

        start =

          ''

            ${fvwm}/bin/fvwm &

            ${fvwm2}/bin/fvwm &

            waitPID=$!

          '';

      };



    environment.systemPackages = [ fvwm ];

    environment.systemPackages = [ fvwm2 ];

  };

}

nixos/modules/services/x11/window-managers/fvwm3.nix

0 → 100644
+35 −0
Original line number Diff line number Diff line 
{ config, lib, pkgs, ... }:



with lib;



let

  cfg = config.services.xserver.windowManager.fvwm3;

  inherit (pkgs) fvwm3;

in



{



  ###### interface



  options = {

    services.xserver.windowManager.fvwm3 = {

      enable = mkEnableOption "Fvwm3 window manager";

    };

  };





  ###### implementation



  config = mkIf cfg.enable {

    services.xserver.windowManager.session = singleton

      { name = "fvwm3";

        start =

          ''

            ${fvwm3}/bin/fvwm3 &

            waitPID=$!

          '';

      };



    environment.systemPackages = [ fvwm3 ];

  };

}

pkgs/applications/window-managers/fvwm/default.nix→pkgs/applications/window-managers/fvwm/2.6.nix

+36 −13
Original line number Diff line number Diff line 
{ autoreconfHook, enableGestures ? false, lib, stdenv, fetchFromGitHub

, pkg-config, cairo, fontconfig, freetype, libXft, libXcursor, libXinerama

, libXpm, libXt, librsvg, libpng, fribidi, perl, libstroke, readline, libxslt }:

{ lib

, stdenv

, fetchFromGitHub

, autoreconfHook

, cairo

, fontconfig

, freetype

, fribidi

, libXcursor

, libXft

, libXinerama

, libXpm

, libXt

, libpng

, librsvg

, libstroke

, libxslt

, perl

, pkg-config

, readline

, enableGestures ? false

}:



stdenv.mkDerivation rec {

  pname = "fvwm";
@@ -10,34 +29,38 @@ stdenv.mkDerivation rec { 
    owner = "fvwmorg";

    repo = pname;

    rev = version;

    sha256 = "14jwckhikc9n4h93m00pzjs7xm2j0dcsyzv3q5vbcnknp6p4w5dh";

    hash = "sha256-sBVOrrl2WrZ2wWN/r1kDUtR+tPwXgDoSJDaxGeFkXJI=";

  };



  nativeBuildInputs = [ autoreconfHook pkg-config ];



  buildInputs = [

    cairo

    fontconfig

    freetype

    libXft

    fribidi

    libXcursor

    libXft

    libXinerama

    libXpm

    libXt

    librsvg

    libpng

    fribidi

    librsvg

    libxslt

    perl

    readline

    libxslt

  ] ++ lib.optional enableGestures libstroke;



  configureFlags = [ "--enable-mandoc" "--disable-htmldoc" ];

  configureFlags = [

    "--enable-mandoc"

    "--disable-htmldoc"

  ];



  meta = {

  meta = with lib; {

    homepage = "http://fvwm.org";

    description = "A multiple large virtual desktop window manager";

    license = lib.licenses.gpl2Plus;

    platforms = lib.platforms.linux;

    maintainers = with lib.maintainers; [ edanaher ];

    license = licenses.gpl2Plus;

    platforms = platforms.linux;

    maintainers = with maintainers; [ edanaher ];

  };

}

pkgs/applications/window-managers/fvwm/3.nix

0 → 100644
+88 −0
Original line number Diff line number Diff line 
{ lib

, stdenv

, fetchFromGitHub

, asciidoctor

, autoreconfHook

, cairo

, fontconfig

, freetype

, fribidi

, imlib

, libSM

, libX11

, libXcursor

, libXft

, libXi

, libXinerama

, libXpm

, libXrandr

, libXt

, libevent

, libintl

, libpng

, librsvg

, libstroke

, libxslt

, perl

, pkg-config

, python3

, readline

, sharutils

}:



stdenv.mkDerivation (finalAttrs: {

  pname = "fvwm3";

  version = "1.0.4";



  src = fetchFromGitHub {

    owner = "fvwmorg";

    repo = "fvwm3";

    rev = finalAttrs.version;

    hash = "sha256-ByMSX4nwXkp+ly39C2+cYy3e9B0vnGcJlyIiS7V6zoI=";

  };



  nativeBuildInputs = [

    autoreconfHook

    asciidoctor

    pkg-config

  ];



  buildInputs = [

    cairo

    fontconfig

    freetype

    fribidi

    imlib

    libSM

    libX11

    libXcursor

    libXft

    libXi

    libXinerama

    libXpm

    libXrandr

    libXt

    libevent

    libintl

    libpng

    librsvg

    libstroke

    libxslt

    perl

    python3

    readline

    sharutils

  ];



  configureFlags = [

    "--enable-mandoc"

  ];



  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;

  };

})