hyprland: 0.34.0 -> 0.35.0

This commit is contained in:
Mihai Fufezan 2024-02-07 18:21:02 +02:00
parent 77adc8879c
commit f7b58a95d7
No known key found for this signature in database
2 changed files with 10 additions and 8 deletions

View File

@ -43,13 +43,13 @@ assert lib.assertMsg (!enableNvidiaPatches) "The option `enableNvidiaPatches` ha
assert lib.assertMsg (!hidpiXWayland) "The option `hidpiXWayland` has been removed. Please refer https://wiki.hyprland.org/Configuring/XWayland";
stdenv.mkDerivation (finalAttrs: {
pname = "hyprland" + lib.optionalString debug "-debug";
version = "0.34.0";
version = "0.35.0";
src = fetchFromGitHub {
owner = "hyprwm";
repo = finalAttrs.pname;
rev = "v${finalAttrs.version}";
hash = "sha256-WSrjBI3k2dM/kGF20At0E6NlrJSB4+pE+WGJ6dFzWEs=";
hash = "sha256-dU5m6Cd4+WQZal2ICDVf1kww/dNzo1YUWRxWeCctEig=";
};
patches = [
@ -67,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: {
--replace "@HASH@" '${finalAttrs.src.rev}' \
--replace "@BRANCH@" "" \
--replace "@MESSAGE@" "" \
--replace "@DATE@" "2024-01-01" \
--replace "@DATE@" "2024-02-05" \
--replace "@TAG@" "" \
--replace "@DIRTY@" ""
'';
@ -114,9 +114,11 @@ stdenv.mkDerivation (finalAttrs: {
then "debug"
else "release";
mesonAutoFeatures = "disabled";
mesonFlags = builtins.concatLists [
(lib.optional (!enableXWayland) "-Dxwayland=disabled")
(lib.optional legacyRenderer "-DLEGACY_RENDERER:STRING=true")
(lib.optional enableXWayland "-Dxwayland=enabled")
(lib.optional legacyRenderer "-Dlegacy_renderer=enabled")
(lib.optional withSystemd "-Dsystemd=enabled")
];
@ -124,7 +126,7 @@ stdenv.mkDerivation (finalAttrs: {
ln -s ${wlroots}/include/wlr $dev/include/hyprland/wlroots
${lib.optionalString wrapRuntimeDeps ''
wrapProgram $out/bin/Hyprland \
--suffix PATH : ${lib.makeBinPath [binutils pciutils]}
--suffix PATH : ${lib.makeBinPath [binutils pciutils stdenv.cc]}
''}
'';

View File

@ -9,8 +9,8 @@ wlroots.overrideAttrs
domain = "gitlab.freedesktop.org";
owner = "wlroots";
repo = "wlroots";
rev = "5d639394f3e83b01596dcd166a44a9a1a2583350";
hash = "sha256-7kvyoA91etzVEl9mkA/EJfB6z/PltxX7Xc4gcr7/xlo=";
rev = "00b869c1a96f300a8f25da95d624524895e0ddf2";
hash = "sha256-5HUTG0p+nCJv3cn73AmFHRZdfRV5AD5N43g8xAePSKM=";
};
patches = [ ]; # don't inherit old.patches