diff options
| author | Mihai Fufezan <[email protected]> | 2023-05-16 20:50:18 +0300 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-05-16 20:50:18 +0300 |
| commit | 78826c6d18ee587a28cf39479f9a015888d2e096 (patch) | |
| tree | 2367501d92abc204c772720d9f6ca14dada4902d /nix | |
| parent | b5b9af508ab74b1922bc3354d178ebf457db631e (diff) | |
| download | Hyprland-78826c6d18ee587a28cf39479f9a015888d2e096.tar.gz Hyprland-78826c6d18ee587a28cf39479f9a015888d2e096.zip | |
meson & nix: install wlroots headers (#2287)
Diffstat (limited to 'nix')
| -rw-r--r-- | nix/default.nix | 4 | ||||
| -rwxr-xr-x | nix/update-inputs.sh | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/nix/default.nix b/nix/default.nix index eee9e6c4..5b59e514 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -113,6 +113,10 @@ in }' ''; + postInstall = '' + ln -s ${wlroots}/include/wlr $dev/include/hyprland/wlroots + ''; + passthru.providedSessions = ["hyprland"]; meta = with lib; { diff --git a/nix/update-inputs.sh b/nix/update-inputs.sh index f4b63f9c..6db18606 100755 --- a/nix/update-inputs.sh +++ b/nix/update-inputs.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env -S nix shell nixpkgs#gawk nixpkgs#git nixpkgs#moreutils nixpkgs#jq nixpkgs#ripgrep -c bash +#!/usr/bin/env -S nix shell nixpkgs#gawk nixpkgs#git nixpkgs#gnused nixpkgs#moreutils nixpkgs#jq nixpkgs#ripgrep -c bash set -ex @@ -16,6 +16,9 @@ if [ "$SUB_REV" != "$CRT_REV" ]; then # remove "dirty" mark from lockfile jq <flake.lock 'del(.nodes.wlroots.original.rev)' | sponge flake.lock + + # fix revision in wlroots.wrap + sed -Ei "s/[a-z0-9]{40}/$CRT_REV/g" subprojects/wlroots.wrap else echo "wlroots is up to date!" fi |