maybe do import?
Some checks failed
Build Hyprland / Build Hyprland (Arch) (push) Has been cancelled
Build Hyprland / Code Style (push) Has been cancelled
Nix / update-inputs (push) Has been cancelled
Nix / hyprland (push) Has been cancelled
Nix / test (push) Has been cancelled
Security Checks / Flawfinder Checks (push) Has been cancelled
Nix / xdph (push) Has been cancelled

This commit is contained in:
do butterflies cry? 2026-03-07 15:45:46 +10:00
parent bcab43b181
commit b41882c169
Signed by: cry
GPG key ID: F68745A836CA0412

View file

@ -62,18 +62,19 @@
hidpiXWayland ? false, hidpiXWayland ? false,
legacyRenderer ? false, legacyRenderer ? false,
withHyprtester ? false, withHyprtester ? false,
}: }: let
let
inherit (builtins) foldl' readFile; inherit (builtins) foldl' readFile;
inherit (lib.asserts) assertMsg; inherit (lib.asserts) assertMsg;
inherit (lib.attrsets) mapAttrsToList; inherit (lib.attrsets) mapAttrsToList;
inherit (lib.lists) inherit
(lib.lists)
flatten flatten
concatLists concatLists
optional optional
optionals optionals
; ;
inherit (lib.strings) inherit
(lib.strings)
makeBinPath makeBinPath
optionalString optionalString
cmakeBool cmakeBool
@ -92,12 +93,8 @@ assert assertMsg (!nvidiaPatches) "The option `nvidiaPatches` has been removed."
assert assertMsg (!enableNvidiaPatches) "The option `enableNvidiaPatches` has been removed."; assert assertMsg (!enableNvidiaPatches) "The option `enableNvidiaPatches` has been removed.";
assert assertMsg (!hidpiXWayland) assert assertMsg (!hidpiXWayland)
"The option `hidpiXWayland` has been removed. Please refer https://wiki.hypr.land/Configuring/XWayland"; "The option `hidpiXWayland` has been removed. Please refer https://wiki.hypr.land/Configuring/XWayland";
assert assertMsg ( assert assertMsg (!legacyRenderer) "The option `legacyRenderer` has been removed. Legacy renderer is no longer supported.";
!legacyRenderer assert assertMsg (!withHyprtester) "The option `withHyprtester` has been removed. Hyprtester is always built now.";
) "The option `legacyRenderer` has been removed. Legacy renderer is no longer supported.";
assert assertMsg (
!withHyprtester
) "The option `withHyprtester` has been removed. Hyprtester is always built now.";
customStdenv.mkDerivation (finalAttrs: { customStdenv.mkDerivation (finalAttrs: {
pname = "hyprland${optionalString debug "-debug"}"; pname = "hyprland${optionalString debug "-debug"}";
inherit version withTests; inherit version withTests;
@ -114,7 +111,7 @@ customStdenv.mkDerivation (finalAttrs: {
../assets/install ../assets/install
../hyprctl ../hyprctl
../hyprland.pc.in ../hyprland.pc.in
# ../hyprpm ../hyprpm
../LICENSE ../LICENSE
../protocols ../protocols
../src ../src
@ -146,7 +143,10 @@ customStdenv.mkDerivation (finalAttrs: {
GIT_COMMITS = revCount; GIT_COMMITS = revCount;
GIT_COMMIT_DATE = date; GIT_COMMIT_DATE = date;
GIT_COMMIT_HASH = commit; GIT_COMMIT_HASH = commit;
GIT_DIRTY = if (commit == "") then "clean" else "dirty"; GIT_DIRTY =
if (commit == "")
then "clean"
else "dirty";
GIT_TAG = "v${trim (readFile "${finalAttrs.src}/VERSION")}"; GIT_TAG = "v${trim (readFile "${finalAttrs.src}/VERSION")}";
}; };
@ -215,7 +215,10 @@ customStdenv.mkDerivation (finalAttrs: {
strictDeps = true; strictDeps = true;
cmakeBuildType = if debug then "Debug" else "RelWithDebInfo"; cmakeBuildType =
if debug
then "Debug"
else "RelWithDebInfo";
# we want as much debug info as possible # we want as much debug info as possible
dontStrip = debug; dontStrip = debug;