fix Nix build and add updater
- move unnecessary toplevel files to nix/ - added patch that ignores the submodule (revert) - add update script run by a workflow
This commit is contained in:
Mihai Fufezan
parent
9acf15efd7
commit
9447fcd603
7 changed files with 162 additions and 8 deletions
86
nix/default.nix
Normal file
86
nix/default.nix
Normal file
|
|
@ -0,0 +1,86 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
cmake,
|
||||
ninja,
|
||||
libdrm,
|
||||
libinput,
|
||||
libxcb,
|
||||
libxkbcommon,
|
||||
mesa,
|
||||
mount,
|
||||
pango,
|
||||
wayland,
|
||||
wayland-protocols,
|
||||
wayland-scanner,
|
||||
wlroots,
|
||||
xcbutilwm,
|
||||
xwayland,
|
||||
enableXWayland ? true,
|
||||
version ? "git",
|
||||
}:
|
||||
stdenv.mkDerivation {
|
||||
pname = "hyprland";
|
||||
inherit version;
|
||||
src = ../.;
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
ninja
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
[
|
||||
libdrm
|
||||
libinput
|
||||
libxcb
|
||||
libxkbcommon
|
||||
mesa
|
||||
pango
|
||||
wayland
|
||||
wayland-protocols
|
||||
wayland-scanner
|
||||
(wlroots.override {inherit enableXWayland;})
|
||||
xcbutilwm
|
||||
]
|
||||
++ lib.optional enableXWayland xwayland;
|
||||
|
||||
cmakeFlags =
|
||||
["-DCMAKE_BUILD_TYPE=Release"]
|
||||
++ lib.optional (!enableXWayland) "-DNO_XWAYLAND=true";
|
||||
|
||||
# enables building with nix-supplied wlroots instead of submodule
|
||||
patches = [ ./wlroots.patch ];
|
||||
postPatch = ''
|
||||
make config
|
||||
'';
|
||||
|
||||
postBuild = ''
|
||||
pushd ../hyprctl
|
||||
make all
|
||||
popd
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
pushd ..
|
||||
install -Dm644 ./example/hyprland.desktop -t $out/share/wayland-sessions
|
||||
install -Dm755 ./build/Hyprland -t $out/bin
|
||||
install -Dm755 ./hyprctl/hyprctl -t $out/bin
|
||||
install -Dm644 ./assets/* -t $out/share/hyprland
|
||||
install -Dm644 ./example/hyprland.conf -t $out/share/hyprland
|
||||
popd
|
||||
'';
|
||||
|
||||
passthru.providedSessions = ["hyprland"];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/vaxerski/Hyprland";
|
||||
description = "A dynamic tiling Wayland compositor that doesn't sacrifice on its looks";
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.linux;
|
||||
mainProgram = "Hyprland";
|
||||
};
|
||||
}
|
||||
62
nix/module.nix
Normal file
62
nix/module.nix
Normal file
|
|
@ -0,0 +1,62 @@
|
|||
# Copied from https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/programs/sway.nix
|
||||
self: {
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.programs.hyprland;
|
||||
in {
|
||||
options.programs.hyprland = {
|
||||
enable = mkEnableOption ''
|
||||
Hyprland, the dynamic tiling Wayland compositor that doesn't sacrifice on its looks.
|
||||
You can manually launch Hyprland by executing "exec Hyprland" on a TTY.
|
||||
A configuration file will be generated in ~/.config/hypr/hyprland.conf.
|
||||
See <link xlink:href="https://github.com/vaxerski/Hyprland/wiki" /> for
|
||||
more information.
|
||||
'';
|
||||
|
||||
package = mkOption {
|
||||
type = types.package;
|
||||
default = self.packages.${pkgs.system}.default;
|
||||
defaultText = literalExpression "<Hyprland flake>.packages.<system>.default";
|
||||
example = literalExpression "<Hyprland flake>.packages.<system>.default.override { }";
|
||||
description = ''
|
||||
Hyprland package to use.
|
||||
'';
|
||||
};
|
||||
|
||||
extraPackages = mkOption {
|
||||
type = with types; listOf package;
|
||||
default = with pkgs; [
|
||||
kitty
|
||||
wofi
|
||||
swaybg
|
||||
];
|
||||
defaultText = literalExpression ''
|
||||
with pkgs; [ kitty wofi swaybg ];
|
||||
'';
|
||||
example = literalExpression ''
|
||||
with pkgs; [
|
||||
alacritty wofi
|
||||
]
|
||||
'';
|
||||
description = ''
|
||||
Extra packages to be installed system wide.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
environment.systemPackages = [cfg.package] ++ cfg.extraPackages;
|
||||
security.polkit.enable = true;
|
||||
hardware.opengl.enable = mkDefault true;
|
||||
fonts.enableDefaultFonts = mkDefault true;
|
||||
programs.dconf.enable = mkDefault true;
|
||||
services.xserver.displayManager.sessionPackages = [cfg.package];
|
||||
programs.xwayland.enable = mkDefault true;
|
||||
xdg.portal.enable = mkDefault true;
|
||||
xdg.portal.extraPortals = [pkgs.xdg-desktop-portal-wlr];
|
||||
};
|
||||
}
|
||||
13
nix/update-inputs.sh
Executable file
13
nix/update-inputs.sh
Executable file
|
|
@ -0,0 +1,13 @@
|
|||
#!/usr/bin/env -S nix shell nixpkgs#gawk nixpkgs#git nixpkgs#moreutils -c bash
|
||||
|
||||
# get wlroots revision from submodule
|
||||
rev=$(git submodule status | awk '{ print substr($1,2)}')
|
||||
|
||||
# update nixpkgs to latest version
|
||||
nix flake lock --update-input nixpkgs
|
||||
|
||||
# update wlroots to submodule revision
|
||||
nix flake lock --override-input wlroots "gitlab:wlroots/wlroots/$rev?host=gitlab.freedesktop.org"
|
||||
|
||||
# remove "dirty" mark from lockfile
|
||||
jq < flake.lock 'del(.nodes.wlroots.original.rev)' | sponge flake.lock
|
||||
139
nix/wlroots.patch
Normal file
139
nix/wlroots.patch
Normal file
|
|
@ -0,0 +1,139 @@
|
|||
diff --git a/Makefile b/Makefile
|
||||
index 55088a7..b185eb9 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -89,7 +89,6 @@ clear:
|
||||
rm -rf build
|
||||
rm -f *.o *-protocol.h *-protocol.c
|
||||
rm -f ./hyprctl/hyprctl
|
||||
- rm -rf ./wlroots/build
|
||||
|
||||
all:
|
||||
make config
|
||||
@@ -114,16 +113,4 @@ uninstall:
|
||||
rm -f ${PREFIX}/bin/hyprctl
|
||||
rm -rf ${PREFIX}/share/hyprland
|
||||
|
||||
-protocols: xdg-shell-protocol.o wlr-layer-shell-unstable-v1-protocol.o wlr-screencopy-unstable-v1-protocol.o idle-protocol.o ext-workspace-unstable-v1-protocol.o pointer-constraints-unstable-v1-protocol.o
|
||||
-
|
||||
-config:
|
||||
- make protocols
|
||||
-
|
||||
- sed -i -E 's/(soversion = 11)([^032]|$$)/soversion = 11032/g' ./wlroots/meson.build
|
||||
-
|
||||
- rm -rf ./wlroots/build
|
||||
-
|
||||
- cd wlroots && meson ./build --prefix=/usr --buildtype=release
|
||||
- cd wlroots && ninja -C build/
|
||||
-
|
||||
- cd wlroots && sudo ninja -C build/ install
|
||||
+config: xdg-shell-protocol.o wlr-layer-shell-unstable-v1-protocol.o wlr-screencopy-unstable-v1-protocol.o idle-protocol.o ext-workspace-unstable-v1-protocol.o pointer-constraints-unstable-v1-protocol.o
|
||||
diff --git a/src/includes.hpp b/src/includes.hpp
|
||||
index 5c216b7..65f2d0f 100644
|
||||
--- a/src/includes.hpp
|
||||
+++ b/src/includes.hpp
|
||||
@@ -34,56 +34,56 @@
|
||||
#define static
|
||||
|
||||
extern "C" {
|
||||
-#include "../wlroots/include/wlr/backend.h"
|
||||
-#include "../wlroots/include/wlr/backend/libinput.h"
|
||||
-#include "../wlroots/include/wlr/render/allocator.h"
|
||||
-#include "../wlroots/include/wlr/render/wlr_renderer.h"
|
||||
-#include "../wlroots/include/wlr/types/wlr_compositor.h"
|
||||
-#include "../wlroots/include/wlr/types/wlr_cursor.h"
|
||||
-#include "../wlroots/include/wlr/types/wlr_data_control_v1.h"
|
||||
-#include "../wlroots/include/wlr/types/wlr_data_device.h"
|
||||
-#include "../wlroots/include/wlr/types/wlr_export_dmabuf_v1.h"
|
||||
-#include "../wlroots/include/wlr/types/wlr_linux_dmabuf_v1.h"
|
||||
-#include "../wlroots/include/wlr/types/wlr_gamma_control_v1.h"
|
||||
-#include "../wlroots/include/wlr/types/wlr_idle.h"
|
||||
-#include "../wlroots/include/wlr/types/wlr_input_device.h"
|
||||
-#include "../wlroots/include/wlr/types/wlr_keyboard.h"
|
||||
-#include "../wlroots/include/wlr/types/wlr_layer_shell_v1.h"
|
||||
-#include "../wlroots/include/wlr/types/wlr_matrix.h"
|
||||
-#include "../wlroots/include/wlr/types/wlr_output.h"
|
||||
-#include "../wlroots/include/wlr/types/wlr_output_layout.h"
|
||||
-#include "../wlroots/include/wlr/types/wlr_output_management_v1.h"
|
||||
-#include "../wlroots/include/wlr/types/wlr_pointer.h"
|
||||
-#include "../wlroots/include/wlr/types/wlr_presentation_time.h"
|
||||
-#include "../wlroots/include/wlr/types/wlr_primary_selection.h"
|
||||
-#include "../wlroots/include/wlr/types/wlr_primary_selection_v1.h"
|
||||
-#include "../wlroots/include/wlr/types/wlr_screencopy_v1.h"
|
||||
-#include "../wlroots/include/wlr/types/wlr_seat.h"
|
||||
-#include "../wlroots/include/wlr/types/wlr_server_decoration.h"
|
||||
-#include "../wlroots/include/wlr/types/wlr_viewporter.h"
|
||||
-#include "../wlroots/include/wlr/types/wlr_virtual_keyboard_v1.h"
|
||||
-#include "../wlroots/include/wlr/types/wlr_xcursor_manager.h"
|
||||
-#include "../wlroots/include/wlr/types/wlr_xdg_activation_v1.h"
|
||||
-#include "../wlroots/include/wlr/types/wlr_xdg_decoration_v1.h"
|
||||
-#include "../wlroots/include/wlr/types/wlr_xdg_output_v1.h"
|
||||
-#include "../wlroots/include/wlr/types/wlr_xdg_shell.h"
|
||||
-#include "../wlroots/include/wlr/types/wlr_subcompositor.h"
|
||||
-#include "../wlroots/include/wlr/types/wlr_scene.h"
|
||||
-#include "../wlroots/include/wlr/types/wlr_output_damage.h"
|
||||
-#include "../wlroots/include/wlr/types/wlr_input_inhibitor.h"
|
||||
-#include "../wlroots/include/wlr/types/wlr_keyboard_shortcuts_inhibit_v1.h"
|
||||
-#include "../wlroots/include/wlr/types/wlr_virtual_pointer_v1.h"
|
||||
-#include "../wlroots/include/wlr/types/wlr_foreign_toplevel_management_v1.h"
|
||||
-#include "../wlroots/include/wlr/util/log.h"
|
||||
-#include "../wlroots/include/wlr/xwayland.h"
|
||||
-#include "../wlroots/include/wlr/util/region.h"
|
||||
+#include <wlr/backend.h>
|
||||
+#include <wlr/backend/libinput.h>
|
||||
+#include <wlr/render/allocator.h>
|
||||
+#include <wlr/render/wlr_renderer.h>
|
||||
+#include <wlr/types/wlr_compositor.h>
|
||||
+#include <wlr/types/wlr_cursor.h>
|
||||
+#include <wlr/types/wlr_data_control_v1.h>
|
||||
+#include <wlr/types/wlr_data_device.h>
|
||||
+#include <wlr/types/wlr_export_dmabuf_v1.h>
|
||||
+#include <wlr/types/wlr_linux_dmabuf_v1.h>
|
||||
+#include <wlr/types/wlr_gamma_control_v1.h>
|
||||
+#include <wlr/types/wlr_idle.h>
|
||||
+#include <wlr/types/wlr_input_device.h>
|
||||
+#include <wlr/types/wlr_keyboard.h>
|
||||
+#include <wlr/types/wlr_layer_shell_v1.h>
|
||||
+#include <wlr/types/wlr_matrix.h>
|
||||
+#include <wlr/types/wlr_output.h>
|
||||
+#include <wlr/types/wlr_output_layout.h>
|
||||
+#include <wlr/types/wlr_output_management_v1.h>
|
||||
+#include <wlr/types/wlr_pointer.h>
|
||||
+#include <wlr/types/wlr_presentation_time.h>
|
||||
+#include <wlr/types/wlr_primary_selection.h>
|
||||
+#include <wlr/types/wlr_primary_selection_v1.h>
|
||||
+#include <wlr/types/wlr_screencopy_v1.h>
|
||||
+#include <wlr/types/wlr_seat.h>
|
||||
+#include <wlr/types/wlr_server_decoration.h>
|
||||
+#include <wlr/types/wlr_viewporter.h>
|
||||
+#include <wlr/types/wlr_virtual_keyboard_v1.h>
|
||||
+#include <wlr/types/wlr_xcursor_manager.h>
|
||||
+#include <wlr/types/wlr_xdg_activation_v1.h>
|
||||
+#include <wlr/types/wlr_xdg_decoration_v1.h>
|
||||
+#include <wlr/types/wlr_xdg_output_v1.h>
|
||||
+#include <wlr/types/wlr_xdg_shell.h>
|
||||
+#include <wlr/types/wlr_subcompositor.h>
|
||||
+#include <wlr/types/wlr_scene.h>
|
||||
+#include <wlr/types/wlr_output_damage.h>
|
||||
+#include <wlr/types/wlr_input_inhibitor.h>
|
||||
+#include <wlr/types/wlr_keyboard_shortcuts_inhibit_v1.h>
|
||||
+#include <wlr/types/wlr_virtual_pointer_v1.h>
|
||||
+#include <wlr/types/wlr_foreign_toplevel_management_v1.h>
|
||||
+#include <wlr/util/log.h>
|
||||
+#include <wlr/xwayland.h>
|
||||
+#include <wlr/util/region.h>
|
||||
#include <xkbcommon/xkbcommon.h>
|
||||
#include <X11/Xproto.h>
|
||||
-#include "../wlroots/include/wlr/render/egl.h"
|
||||
-#include "../wlroots/include/wlr/render/gles2.h"
|
||||
-#include "../wlroots/include/wlr/render/wlr_texture.h"
|
||||
-#include "../wlroots/include/wlr/types/wlr_pointer_constraints_v1.h"
|
||||
-#include "../wlroots/include/wlr/types/wlr_relative_pointer_v1.h"
|
||||
+#include <wlr/render/egl.h>
|
||||
+#include <wlr/render/gles2.h>
|
||||
+#include <wlr/render/wlr_texture.h>
|
||||
+#include <wlr/types/wlr_pointer_constraints_v1.h>
|
||||
+#include <wlr/types/wlr_relative_pointer_v1.h>
|
||||
}
|
||||
|
||||
#undef class
|
||||
Loading…
Add table
Add a link
Reference in a new issue