diff --git a/pages/Nix/Contributing and Debugging.md b/pages/Nix/Contributing and Debugging.md index c37bb2f..6be3dd5 100644 --- a/pages/Nix/Contributing and Debugging.md +++ b/pages/Nix/Contributing and Debugging.md @@ -15,13 +15,21 @@ 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";`. +`cmakeBuildType = "debug";` or `mesonBuildType = "debug";`, depending on the +program. ## Bisecting an issue Follow the [Bisecting an issue](https://wiki.hyprland.org/Crashes-and-Bugs/#bisecting-an-issue) -guide. To build, run `nix build '.?submodules=1'`. +guide. To build, run `nix build`. + +{{< callout >}} + +To build with Tracy support, modify `nix/default.nix` to enable the flag, then run +`nix build '.?submodules=1'`. + +{{< /callout >}} To view logs, pass the `--print-build-logs` (`-L`) flag. @@ -45,8 +53,8 @@ For CMake: ```bash $ cmakeConfigurePhase # to run the CMake configure phase -$ ninjaBuildPhase # to run the Ninja build phase -$ ninjaInstallPhase # to run the Ninja install 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) ``` For Meson: diff --git a/pages/Nix/Hyprland on Home Manager.md b/pages/Nix/Hyprland on Home Manager.md index 6c543f1..c3895e5 100644 --- a/pages/Nix/Hyprland on Home Manager.md +++ b/pages/Nix/Hyprland on Home Manager.md @@ -58,7 +58,7 @@ Don't forget to replace `user@hostname` with your username and hostname! inputs.nixpkgs.follows = "nixpkgs"; }; - hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; + hyprland.url = "github:hyprwm/Hyprland"; }; outputs = {nixpkgs, home-manager, hyprland, ...}: { @@ -103,11 +103,7 @@ make any adjustment for your setup. flake-compat = builtins.fetchTarball "https://github.com/edolstra/flake-compat/archive/master.tar.gz"; hyprland = (import flake-compat { - # we're not using pkgs.fetchgit as that requires a hash to be provided - src = builtins.fetchGit { - url = "https://github.com/hyprwm/Hyprland.git"; - submodules = true; - }; + src = builtins.fetchTarball "https://github.com/hyprwm/Hyprland/archive/main.tar.gz"; }).defaultNix; in { wayland.windowManager.hyprland = { diff --git a/pages/Nix/Hyprland on NixOS.md b/pages/Nix/Hyprland on NixOS.md index 65bc1a3..b2caead 100644 --- a/pages/Nix/Hyprland on NixOS.md +++ b/pages/Nix/Hyprland on NixOS.md @@ -66,7 +66,7 @@ this: # flake.nix { - inputs.hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; + inputs.hyprland.url = "github:hyprwm/Hyprland"; # ... outputs = {nixpkgs, ...} @ inputs: { @@ -135,11 +135,7 @@ have to compile Hyprland yourself. flake-compat = builtins.fetchTarball "https://github.com/edolstra/flake-compat/archive/master.tar.gz"; hyprland = (import flake-compat { - # we're not using pkgs.fetchgit as that requires a hash to be provided - src = builtins.fetchGit { - url = "https://github.com/hyprwm/Hyprland.git"; - submodules = true; - }; + src = builtins.fetchTarball "https://github.com/hyprwm/Hyprland/archive/main.tar.gz"; }).defaultNix; in { programs.hyprland = { diff --git a/pages/Nix/Hyprland on other distros.md b/pages/Nix/Hyprland on other distros.md index dba61cc..24fc823 100644 --- a/pages/Nix/Hyprland on other distros.md +++ b/pages/Nix/Hyprland on other distros.md @@ -29,7 +29,7 @@ nix profile install nixpkgs#hyprland NOTE: Make sure to enable [Cachix](../Cachix) first. ```sh -nix profile install git+https://github.com/hyprwm/Hyprland?submodules=1 +nix profile install github:hyprwm/Hyprland ``` {{< /tab >}} diff --git a/pages/Nix/Options & Overrides.md b/pages/Nix/Options & Overrides.md index 317a561..3dd5540 100644 --- a/pages/Nix/Options & Overrides.md +++ b/pages/Nix/Options & Overrides.md @@ -46,17 +46,17 @@ you can do it like this: ```nix $ nix repl -nix-repl> :lf git+https://github.com/hyprwm/Hyprland?submodules=1 +nix-repl> :lf github:hyprwm/Hyprland 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 -`cmakeBuildType`: +`mesonBuildType`: ```nix $ nix repl -nix-repl> :lf git+https://github.com/hyprwm/Hyprland?submodules=1 -nix-repl> :bl outputs.packages.x86_64-linux.hyprland.overrideAttrs (self: super: { cmakeBuildType = "debug" }) +nix-repl> :lf github:hyprwm/Hyprland +nix-repl> :bl outputs.packages.x86_64-linux.hyprland.overrideAttrs (self: super: { mesonBuildType = "debug" }) ``` diff --git a/pages/Nix/Plugins.md b/pages/Nix/Plugins.md index e1dc0e7..961eb92 100644 --- a/pages/Nix/Plugins.md +++ b/pages/Nix/Plugins.md @@ -41,7 +41,7 @@ First, add the flake to your flake inputs: ```nix { inputs = { - hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; + hyprland.url = "github:hyprwm/Hyprland"; hyprland-plugins = { url = "github:hyprwm/hyprland-plugins";