diff options
author | Anderson Torres <torres.anderson.85@protonmail.com> | 2022-07-29 21:10:55 -0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-07-29 21:10:55 -0300 |
commit | a34e3f299ce33f95debe0ac432ca5d3a519d67ea (patch) | |
tree | 0a0821982d5529e916d297ccb18041f0122ddb18 /pkgs | |
parent | c974a9fca2599cdb723cd97487b1901614b88f83 (diff) | |
parent | bef8e4df1dcd3382e71d0ab512e05eaf0fb8559f (diff) |
Merge pull request #183209 from AndersonTorres/nscde
fvwm3: init at 1.0.4
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/window-managers/fvwm/2.6.nix (renamed from pkgs/applications/window-managers/fvwm/default.nix) | 49 | ||||
-rw-r--r-- | pkgs/applications/window-managers/fvwm/3.nix | 88 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
3 files changed, 127 insertions, 14 deletions
diff --git a/pkgs/applications/window-managers/fvwm/default.nix b/pkgs/applications/window-managers/fvwm/2.6.nix index 07c3573fb2a77..2cecb81ea04b0 100644 --- a/pkgs/applications/window-managers/fvwm/default.nix +++ b/pkgs/applications/window-managers/fvwm/2.6.nix @@ -1,6 +1,25 @@ -{ 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 ]; }; } diff --git a/pkgs/applications/window-managers/fvwm/3.nix b/pkgs/applications/window-managers/fvwm/3.nix new file mode 100644 index 0000000000000..f3862f9ac0d84 --- /dev/null +++ b/pkgs/applications/window-managers/fvwm/3.nix @@ -0,0 +1,88 @@ +{ 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; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f2c5fa92b1494..5994b8eeec20e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26943,7 +26943,9 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreAudio CoreMIDI CoreServices Cocoa; }; - fvwm = callPackage ../applications/window-managers/fvwm { }; + fvwm = fvwm2; + fvwm2 = callPackage ../applications/window-managers/fvwm/2.6.nix { }; + fvwm3 = callPackage ../applications/window-managers/fvwm/3.nix { }; ganttproject-bin = callPackage ../applications/misc/ganttproject-bin { }; |