Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{ lib
, stdenv
, fetchFromGitHub
, meson
, ninja
, cmake
, pkg-config
, wayland-scanner
, makeWrapper
, wrapQtAppsHook
, hyprland-protocols
, hyprlang
, libdrm
, mesa
, pipewire
Expand All @@ -19,22 +19,22 @@
, wayland
, wayland-protocols
, hyprland
, hyprpicker
, slurp
}:
stdenv.mkDerivation (self: {
pname = "xdg-desktop-portal-hyprland";
version = "1.2.6";
version = "1.3.1";

src = fetchFromGitHub {
owner = "hyprwm";
repo = "xdg-desktop-portal-hyprland";
rev = "v${self.version}";
hash = "sha256-VRr5Xc4S/VPr/gU3fiOD3vSIL2+GJ+LUrmFTWTwnTz4=";
hash = "sha256-wP611tGIWBA4IXShWbah7TxqdbvhfcfT2vnXalX/qzk=";
};

nativeBuildInputs = [
meson
ninja
cmake
pkg-config
wayland-scanner
makeWrapper
Expand All @@ -43,6 +43,7 @@ stdenv.mkDerivation (self: {

buildInputs = [
hyprland-protocols
hyprlang
libdrm
mesa
pipewire
Expand All @@ -63,7 +64,7 @@ stdenv.mkDerivation (self: {
--prefix PATH ":" ${lib.makeBinPath [slurp hyprland]}

wrapProgramShell $out/libexec/xdg-desktop-portal-hyprland \
--prefix PATH ":" ${lib.makeBinPath [(placeholder "out")]}
--prefix PATH ":" ${lib.makeBinPath [(placeholder "out") hyprpicker]}
'';

meta = with lib; {
Expand Down
30 changes: 30 additions & 0 deletions pkgs/by-name/hy/hyprlang/package.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
lib,
stdenv,
fetchFromGitHub,
cmake,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "hyprlang";
version = "0.2.1";

src = fetchFromGitHub {
owner = "hyprwm";
repo = "hyprlang";
rev = "v${finalAttrs.version}";
hash = "sha256-KjAYC3sMyfipCHpkj0XSPw/C9KdCNlWtguQW5rEUiqo=";
};

nativeBuildInputs = [cmake];

outputs = ["out" "dev"];

doCheck = true;

meta = with lib; {
homepage = "https://github.com/hyprwm/hyprlang";
description = "The official implementation library for the hypr config language";
license = licenses.gpl3Plus;
platforms = platforms.linux;
};
})
4 changes: 4 additions & 0 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5709,6 +5709,10 @@ with pkgs;

hyprland-protocols = callPackage ../applications/window-managers/hyprwm/hyprland-protocols { };

hyprlang = callPackage ../by-name/hy/hyprlang/package.nix {
stdenv = gcc13Stdenv;
};

hyprnome = callPackage ../applications/misc/hyprnome { };

hyprpaper = callPackage ../applications/window-managers/hyprwm/hyprpaper { };
Expand Down