Unverified Commit 3dcfab7d authored by rewine's avatar rewine Committed by GitHub
Browse files

Merge pull request #330473 from museoa/upload-dwl 

dwl: 0.5 -> 0.6
parents bd230b5c 37014e4c

pkgs/applications/window-managers/dwl/default.nix→pkgs/by-name/dw/dwl/package.nix

+132 −0
Original line number Diff line number Diff line 
{ lib

, stdenv

, fetchFromGitea

, installShellFiles

, libX11

, libinput

, libxcb

, libxkbcommon

, pixman

, pkg-config

, wayland-scanner

, wayland

, wayland-protocols

, wlroots

, writeText

, xcbutilwm

, xwayland

, enableXWayland ? true

, conf ? null

{

  lib,

  fetchFromGitea,

  installShellFiles,

  libX11,

  libinput,

  libxcb,

  libxkbcommon,

  pixman,

  pkg-config,

  stdenv,

  testers,

  wayland,

  wayland-protocols,

  wayland-scanner,

  wlroots,

  writeText,

  xcbutilwm,

  xwayland,

  # Boolean flags

  enableXWayland ? true,

  withCustomConfigH ? (configH != null),

  # Configurable options

  configH ?

    if conf != null then

      lib.warn ''

        conf parameter is deprecated;

        use configH instead

      '' conf

    else

      null,

  # Deprecated options

  # Remove them before next version of either Nixpkgs or dwl itself

  conf ? null,

}:



# If we set withCustomConfigH, let's not forget configH

assert withCustomConfigH -> (configH != null);

stdenv.mkDerivation (finalAttrs: {

  pname = "dwl";

  version = "0.5";

  version = "0.6";



  src = fetchFromGitea {

    domain = "codeberg.org";

    owner = "dwl";

    repo = "dwl";

    rev = "v${finalAttrs.version}";

    hash = "sha256-U/vqGE1dJKgEGTfPMw02z5KJbZLWY1vwDJWnJxT8urM=";

    hash = "sha256-fygUzEi4bgopesvHByfpatkLFYI98qozJOUBNM2t9Mg=";

  };



  nativeBuildInputs = [
@@ -37,7 +54,8 @@ stdenv.mkDerivation (finalAttrs: { 
    wayland-scanner

  ];



  buildInputs = [

  buildInputs =

    [

      libinput

      libxcb

      libxkbcommon
@@ -45,37 +63,55 @@ stdenv.mkDerivation (finalAttrs: { 
      wayland

      wayland-protocols

      wlroots

  ] ++ lib.optionals enableXWayland [

    ]

    ++ lib.optionals enableXWayland [

      libX11

      xcbutilwm

      xwayland

    ];



  outputs = [ "out" "man" ];

  outputs = [

    "out"

    "man"

  ];



  # Allow users to set an alternative config.def.h

  postPatch = let

    configFile = if lib.isDerivation conf || builtins.isPath conf

                 then conf

                 else writeText "config.def.h" conf;

  in lib.optionalString (conf != null) "cp ${configFile} config.def.h";

  postPatch =

    let

      configFile =

        if lib.isDerivation configH || builtins.isPath configH then

          configH

        else

          writeText "config.h" configH;

    in

    lib.optionalString withCustomConfigH "cp ${configFile} config.h";



  makeFlags = [

  makeFlags =

    [

      "PKG_CONFIG=${stdenv.cc.targetPrefix}pkg-config"

      "WAYLAND_SCANNER=wayland-scanner"

      "PREFIX=$(out)"

      "MANDIR=$(man)/share/man"

    ]

    ++ lib.optionals enableXWayland [

      ''XWAYLAND="-DXWAYLAND"''

      ''XLIBS="xcb xcb-icccm"''

    ];



  preBuild = ''

    makeFlagsArray+=(

      XWAYLAND=${lib.optionalString enableXWayland "-DXWAYLAND"}

      XLIBS=${lib.optionalString enableXWayland "xcb\\ xcb-icccm"}

    )

  '';

  strictDeps = true;



  # required for whitespaces in makeFlags

  __structuredAttrs = true;



  passthru = {

    tests.version = testers.testVersion {

      package = finalAttrs.finalPackage;

      # `dwl -v` emits its version string to stderr and returns 1

      command = "dwl -v 2>&1; return 0";

    };

  };



  meta = {

    homepage = "https://github.com/djpohly/dwl/";

    homepage = "https://codeberg.org/dwl/dwl";

    description = "Dynamic window manager for Wayland";

    longDescription = ''

      dwl is a compact, hackable compositor for Wayland based on wlroots. It is
@@ -85,10 +121,8 @@ stdenv.mkDerivation (finalAttrs: { 


      - Easy to understand, hack on, and extend with patches

      - One C source file (or a very small number) configurable via config.h

      - Limited to 2000 SLOC to promote hackability

      - Tied to as few external dependencies as possible

    '';

    changelog = "https://github.com/djpohly/dwl/releases/tag/v${finalAttrs.version}";

    license = lib.licenses.gpl3Only;

    maintainers = [ lib.maintainers.AndersonTorres ];

    inherit (wayland.meta) platforms;

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -29941,7 +29941,7 @@ with pkgs; 














  dyff = callPackage ../development/tools/dyff { };



























  dwl = callPackage ../applications/window-managers/dwl {













  dwl = callPackage ../by-name/dw/dwl/package.nix {















    wlroots = wlroots_0_17;















  };