diff --git a/content/Contributing and Debugging/_index.md b/content/Contributing and Debugging/_index.md index 88c09e9..80d7420 100644 --- a/content/Contributing and Debugging/_index.md +++ b/content/Contributing and Debugging/_index.md @@ -35,13 +35,6 @@ breakpoint and it will crash after you continue out of it. Attach and profile in your preferred way. -### Meson - -```console -meson setup build -Dbuildtype=debug -ninja -C build -``` - ### Nix To build the package in debug mode, you have to override it like this: diff --git a/content/Getting Started/Installation.md b/content/Getting Started/Installation.md index 138ee98..1bb50a3 100644 --- a/content/Getting Started/Installation.md +++ b/content/Getting Started/Installation.md @@ -6,9 +6,9 @@ title: Installation > [!WARNING] > Hyprland is not meant to be a full and user-friendly Desktop Environment. In a nutshell, it's a set of > tools to allow you to create your own Desktop Environment. -> +> > Apps, integrations, shells, etc, are **your** responsibility to pick, install and configure. -> +> > This wiki is _very_ verbose. It's highly recommended to scour and read the wiki first before > assuming something is not working or not available. @@ -32,9 +32,9 @@ Installing Hyprland is very easy. Simply install it with your package manager. > or using `-git` packages. > Hyprland's ecosystem and dependencies are vast and intertwined, and compiling manually will only potentially expose you to outdated, > or incompatible versions of these dependencies. -> +> > If you get `.so` file mismatch / missing errors, it's _entirely your fault_ for doing this! -> +> > However, if you are an experienced user and want to beta-test new features, you're more than welcome to run the latest > git head. Please don't come asking about ".so file missing" errors though! @@ -72,7 +72,7 @@ If you decide to use the `git` version from the AUR, you can use the [Chaotic Au Be aware that updating dependencies like `hyprutils` might still require you to recompile everything yourself as the Chaotic Aur does not do that automatically. > [!NOTE] -> You can downgrade easily with [downgrade](https://github.com/archlinux-downgrade/downgrade) to get to a previous -git version. +> You can downgrade easily with [downgrade](https://github.com/archlinux-downgrade/downgrade) to get to a previous -git version. {{% /details %}} @@ -236,11 +236,11 @@ for more information. > [!WARNING] > Always use the latest version of Ubuntu for the most up to date dependencies. -> +> > Note: Your mileage may vary, as GDM has some bugs with Hyprland. Check the [Master Tutorial](../Master-Tutorial) for more info. -> +> > Refer to the gist if anything fails. -> +> > > @@ -388,7 +388,7 @@ refer to the Ubuntu tab above > [!WARNING] > Additionally to those, you will also need a few hypr\* dependencies which may or may not be > packaged for your distro of choice: -> +> > - aquamarine > - hyprlang > - hyprcursor @@ -407,20 +407,6 @@ make all && sudo make install _CMake is always recommended as it's the intended way Hyprland should be installed._ -### Meson - -```sh -meson subprojects update --reset -meson setup build -ninja -C build -ninja -C build install --tags runtime,man -``` - -Custom build flags can be found in [`meson_options.txt`](https://github.com/hyprwm/Hyprland/blob/main/meson_options.txt). - -Refer to [Debugging](../../Contributing-and-Debugging) to see how to build & -debug. - ## Crash on launch See [Crashes and Bugs](../../Crashes-and-Bugs). diff --git a/content/Nix/Contributing and Debugging.md b/content/Nix/Contributing and Debugging.md index e40a919..710a5ea 100644 --- a/content/Nix/Contributing and Debugging.md +++ b/content/Nix/Contributing and Debugging.md @@ -16,7 +16,7 @@ A debug build is already provided through Most hyprwm apps also provide their own `-debug` versions. For those that don't, one can build the debug version from the CLI by using [overrideAttrs](../Options-Overrides/#using-nix-repl) with -`cmakeBuildType = "debug";` or `mesonBuildType = "debug";`, depending on the +`cmakeBuildType = "Debug";` or `mesonBuildType = "debug";`, depending on the program. ## Bisecting an issue @@ -67,8 +67,8 @@ For CMake: ```bash cmakeConfigurePhase # to run the CMake configure phase -ninjaBuildPhase # to run the Ninja build phase (or buildPhase when ninja is not available) -ninjaInstallPhase # to run the Ninja install phase (or installPhase when ninja is not available) +buildPhase # to run the build phase +installPhase # to run the install phase ``` For Meson: diff --git a/content/Nix/Options & Overrides.md b/content/Nix/Options & Overrides.md index 29e959a..7c8fc5b 100644 --- a/content/Nix/Options & Overrides.md +++ b/content/Nix/Options & Overrides.md @@ -53,10 +53,10 @@ nix-repl> :bl outputs.packages.x86_64-linux.hyprland.override { /* flag here */ Then you can run Hyprland from the built path. You can also use `overrideAttrs` to override `mkDerivation`'s arguments, such as -`mesonBuildType`: +`cmakeBuildType`: ```nix $ nix repl nix-repl> :lf github:hyprwm/Hyprland -nix-repl> :bl outputs.packages.x86_64-linux.hyprland.overrideAttrs (self: super: { mesonBuildType = "debug" }) +nix-repl> :bl outputs.packages.x86_64-linux.hyprland.overrideAttrs (self: super: { cmakeBuildType = "Debug" }) ```