Skip to content

Conversation

@acid-bong
Copy link
Contributor

@acid-bong acid-bong commented Jul 12, 2025

Personal checks

Refactor includes:

  • replacing rec with finalAttrs
  • removing with lib;
  • some make/install flags refactors

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • Nixpkgs 25.11 Release Notes (or backporting 25.05 Nixpkgs Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
  • NixOS 25.11 Release Notes (or backporting 25.05 NixOS Release notes)
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md, pkgs/README.md, maintainers/README.md and other contributing documentation in corresponding paths.

Add a 👍 reaction to pull requests you find important.

@acid-bong acid-bong changed the title dwm, dwm-status, dmenu, st: move to by-name, refactor dwm{,-status}, dmenu{,-wayland}, st: move to by-name, refactor Jul 12, 2025
@nixpkgs-ci nixpkgs-ci bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. and removed 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Jul 12, 2025
Also added `extraLibs`, like st has
It's no longer necessary + this allows for compiling with extraLibs, if
config.mk was patched
@acid-bong acid-bong force-pushed the refactor/suckless branch from 2cb66c8 to 6db8833 Compare July 12, 2025 19:10
@nixpkgs-ci nixpkgs-ci bot added 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. and removed 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. labels Jul 12, 2025
@acid-bong acid-bong changed the title dwm{,-status}, dmenu{,-wayland}, st: move to by-name, refactor dwm{,-status}, dmenu{,-wayland}, st (+ forks): move to by-name, refactor Jul 12, 2025
Also added support for `conf` and `extraLibs`
@acid-bong acid-bong marked this pull request as ready for review July 13, 2025 06:01
@nix-owners nix-owners bot requested review from 0david0mp, Qusic, globin, pSub, vyp and wineee July 13, 2025 06:04
@@ -50,25 +49,22 @@ stdenv.mkDerivation rec {
makeFlagsArray+=(
PREFIX="$out"
CC="$CC"
# default config.mk hardcodes dependent libraries and include paths
INCS="`$PKG_CONFIG --cflags fontconfig x11 xft xinerama`"
LIBS="`$PKG_CONFIG --libs fontconfig x11 xft xinerama`"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@trofi, you introduced these in #348884, but it already compiles successfully without them. do we still need those?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds fine to drop. Initial fix was a workaround for libxft missing dependency.

@acid-bong
Copy link
Contributor Author

cc @neonfuz (wasn't pinged for some reason)

Copy link
Member

@Qusic Qusic left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

approving dmenu and st. thanks!

@nixpkgs-ci nixpkgs-ci bot added 12.approvals: 1 This PR was reviewed and approved by one person. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages. labels Jul 16, 2025
@acid-bong acid-bong marked this pull request as draft July 23, 2025 14:43
@acid-bong acid-bong marked this pull request as ready for review July 23, 2025 18:44
@wegank
Copy link
Member

wegank commented Jul 24, 2025

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 424634
Commit: 8764e26bd16ecac263f2d0dc0a09a185aa4ab3a7


x86_64-linux

✅ 49 packages built:
  • connman_dmenu
  • dmensamenu
  • dmensamenu.dist
  • dmenu
  • dmenu-bluetooth
  • dmenu-wayland
  • dmenu-wayland.man
  • dwm
  • emojipick
  • git-credential-manager
  • j4-dmenu-desktop
  • keepmenu
  • keepmenu.dist
  • krunner-pass
  • mcaimi-st
  • pass
  • pass-wayland
  • passExtensions.pass-audit
  • passExtensions.pass-audit.dist
  • passExtensions.pass-audit.man
  • passExtensions.pass-import
  • passExtensions.pass-import.dist
  • passff-host
  • python312Packages.bundlewrap-pass
  • python312Packages.bundlewrap-pass.dist
  • python312Packages.dmenu-python
  • python312Packages.dmenu-python.dist
  • python312Packages.keyring-pass
  • python312Packages.keyring-pass.dist
  • python313Packages.bundlewrap-pass
  • python313Packages.bundlewrap-pass.dist
  • python313Packages.dmenu-python
  • python313Packages.dmenu-python.dist
  • python313Packages.keyring-pass
  • python313Packages.keyring-pass.dist
  • qtpass
  • rofi-pass
  • rofi-pass-wayland
  • st
  • st.terminfo
  • surf
  • surf-display
  • tessen
  • tmuxPlugins.pass
  • uwsm
  • uwsm.man
  • wofi-pass
  • xst
  • ytfzf

@wegank wegank merged commit 5a456c6 into NixOS:master Jul 24, 2025
36 of 37 checks passed
@acid-bong acid-bong deleted the refactor/suckless branch July 24, 2025 02:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. 12.approvals: 1 This PR was reviewed and approved by one person. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants