Merge pull request #229751 from fufexan/hyprland
hyprwm: update packages
This commit is contained in:
commit
933c8e6fd2
7 changed files with 34 additions and 29 deletions
|
@ -4,15 +4,15 @@
|
||||||
, meson
|
, meson
|
||||||
, ninja
|
, ninja
|
||||||
}:
|
}:
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "hyprland-protocols";
|
pname = "hyprland-protocols";
|
||||||
version = "unstable-2023-01-13";
|
version = "0.2";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "hyprwm";
|
owner = "hyprwm";
|
||||||
repo = pname;
|
repo = finalAttrs.pname;
|
||||||
rev = "eb7dcc0132ad25addc3e8d434c4bfae6bd3a8c90";
|
rev = "v${finalAttrs.version}";
|
||||||
hash = "sha256-gkLgUg9/fP04bKCJMj/rN0r6PV/cbLShDvKQyFvVap0=";
|
hash = "sha256-QPzwwlGKX95tl6ZEshboZbEwwAXww6lNLdVYd6T9Mrc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
@ -27,4 +27,4 @@ stdenv.mkDerivation rec {
|
||||||
maintainers = with lib.maintainers; [ fufexan ];
|
maintainers = with lib.maintainers; [ fufexan ];
|
||||||
platforms = lib.platforms.linux;
|
platforms = lib.platforms.linux;
|
||||||
};
|
};
|
||||||
}
|
})
|
||||||
|
|
|
@ -36,27 +36,27 @@ let
|
||||||
'';
|
'';
|
||||||
in
|
in
|
||||||
assert assertXWayland;
|
assert assertXWayland;
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "hyprland" + lib.optionalString debug "-debug";
|
pname = "hyprland" + lib.optionalString debug "-debug";
|
||||||
version = "0.24.0";
|
version = "0.25.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "hyprwm";
|
owner = "hyprwm";
|
||||||
repo = "hyprland";
|
repo = finalAttrs.pname;
|
||||||
rev = "v${version}";
|
rev = "v${finalAttrs.version}";
|
||||||
hash = "sha256-zbtxX0NezuNg46PAKscmDfFfNID4rAq2qGNf1BE3Cqc=";
|
hash = "sha256-Npf48UUfywneFYGEc7NQ59xudwvw7EJjwweT4tHguIY=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
# make meson use the provided dependencies instead of the git submodules
|
# make meson use the provided dependencies instead of the git submodules
|
||||||
"${src}/nix/meson-build.patch"
|
"${finalAttrs.src}/nix/meson-build.patch"
|
||||||
];
|
];
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
# Fix hardcoded paths to /usr installation
|
# Fix hardcoded paths to /usr installation
|
||||||
sed -i "s#/usr#$out#" src/render/OpenGL.cpp
|
sed -i "s#/usr#$out#" src/render/OpenGL.cpp
|
||||||
substituteInPlace meson.build \
|
substituteInPlace meson.build \
|
||||||
--replace "@GIT_COMMIT_HASH@" '${version}' \
|
--replace "@GIT_COMMIT_HASH@" '${finalAttrs.src.rev}' \
|
||||||
--replace "@GIT_DIRTY@" ""
|
--replace "@GIT_DIRTY@" ""
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
@ -71,6 +71,7 @@ stdenv.mkDerivation rec {
|
||||||
outputs = [
|
outputs = [
|
||||||
"out"
|
"out"
|
||||||
"man"
|
"man"
|
||||||
|
"dev"
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs =
|
buildInputs =
|
||||||
|
@ -103,7 +104,6 @@ stdenv.mkDerivation rec {
|
||||||
(lib.optional withSystemd "-Dsystemd=enabled")
|
(lib.optional withSystemd "-Dsystemd=enabled")
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
||||||
passthru.providedSessions = [ "hyprland" ];
|
passthru.providedSessions = [ "hyprland" ];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
@ -114,4 +114,4 @@ stdenv.mkDerivation rec {
|
||||||
mainProgram = "Hyprland";
|
mainProgram = "Hyprland";
|
||||||
platforms = wlroots.meta.platforms;
|
platforms = wlroots.meta.platforms;
|
||||||
};
|
};
|
||||||
}
|
})
|
||||||
|
|
|
@ -49,8 +49,8 @@ assert (lib.assertMsg (hidpiXWayland -> enableXWayland) ''
|
||||||
domain = "gitlab.freedesktop.org";
|
domain = "gitlab.freedesktop.org";
|
||||||
owner = "wlroots";
|
owner = "wlroots";
|
||||||
repo = "wlroots";
|
repo = "wlroots";
|
||||||
rev = "7abda952d0000b72d240fe1d41457b9288f0b6e5";
|
rev = "6830bfc17fd94709e2cdd4da0af989f102a26e59";
|
||||||
hash = "sha256-LmI/4Yp/pOOoI4RxLRx9I90NBsiqdRLVOfbATKlgpkg=";
|
hash = "sha256-GGEjkQO9m7YLYIXIXM76HWdhjg4Ye+oafOtyaFAYKI4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
pname =
|
pname =
|
||||||
|
|
|
@ -13,13 +13,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "hyprpaper";
|
pname = "hyprpaper";
|
||||||
version = "unstable-2023-04-05";
|
version = "0.1.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "hyprwm";
|
owner = "hyprwm";
|
||||||
repo = "hyprpaper";
|
repo = finalAttrs.pname;
|
||||||
rev = "9182de9ffc8c76fbf24d16dec0ea7a9430597a06";
|
rev = "v${finalAttrs.version}";
|
||||||
hash = "sha256-LqvhYx1Gu+rlkF4pA1NYZzwRQwz3FeWBqXqmQq86m8o=";
|
hash = "sha256-/Kz4Qy+jx1+bfSq6e2W3MbyODkhs6GqKiiybNtqzvbc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -21,14 +21,14 @@
|
||||||
, libXdmcp
|
, libXdmcp
|
||||||
, debug ? false
|
, debug ? false
|
||||||
}:
|
}:
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "hyprpicker" + lib.optionalString debug "-debug";
|
pname = "hyprpicker" + lib.optionalString debug "-debug";
|
||||||
version = "unstable-2023-03-31";
|
version = "0.1.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "hyprwm";
|
owner = "hyprwm";
|
||||||
repo = "hyprpicker";
|
repo = finalAttrs.pname;
|
||||||
rev = "cc6b3234b2966acd61c8a2e5caae947774666601";
|
rev = "v${finalAttrs.version}";
|
||||||
hash = "sha256-8Tc8am5+iQvzRdnTYIpD3Ewge6TIctrm8tr0H+RvcsE=";
|
hash = "sha256-8Tc8am5+iQvzRdnTYIpD3Ewge6TIctrm8tr0H+RvcsE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -92,4 +92,4 @@ stdenv.mkDerivation {
|
||||||
maintainers = with maintainers; [ fufexan ];
|
maintainers = with maintainers; [ fufexan ];
|
||||||
platforms = wayland.meta.platforms;
|
platforms = wayland.meta.platforms;
|
||||||
};
|
};
|
||||||
}
|
})
|
||||||
|
|
|
@ -9,6 +9,7 @@
|
||||||
, hyprland-share-picker
|
, hyprland-share-picker
|
||||||
, inih
|
, inih
|
||||||
, libdrm
|
, libdrm
|
||||||
|
, libuuid
|
||||||
, mesa
|
, mesa
|
||||||
, pipewire
|
, pipewire
|
||||||
, systemd
|
, systemd
|
||||||
|
@ -36,6 +37,7 @@ stdenv.mkDerivation {
|
||||||
hyprland-protocols
|
hyprland-protocols
|
||||||
inih
|
inih
|
||||||
libdrm
|
libdrm
|
||||||
|
libuuid
|
||||||
mesa
|
mesa
|
||||||
pipewire
|
pipewire
|
||||||
systemd
|
systemd
|
||||||
|
|
|
@ -2,14 +2,17 @@
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, wayland
|
, wayland
|
||||||
}:
|
}:
|
||||||
|
let
|
||||||
|
version = "0.3.1";
|
||||||
|
in
|
||||||
{
|
{
|
||||||
version = "unstable-2023-04-06";
|
inherit version;
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "hyprwm";
|
owner = "hyprwm";
|
||||||
repo = "xdg-desktop-portal-hyprland";
|
repo = "xdg-desktop-portal-hyprland";
|
||||||
rev = "803c00db1191604d50766358dbc5be2de4fcb4e7";
|
rev = "v${version}";
|
||||||
hash = "sha256-+AagxTHrzKgngG+guIWAIV5hX1HkkvMbDxbUq2IVwAM=";
|
hash = "sha256-zHDa8LCZs05TZHQSIZ3ucwyMPglBGHcqTBzfkLjYXTM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
|
Loading…
Reference in a new issue