Unverified Commit efbacad2 authored by a-n-n-a-l-e-e's avatar a-n-n-a-l-e-e Committed by GitHub
Browse files

Merge pull request #278784 from fufexan/xdph 

xdg-desktop-portal-hyprland: 1.2.6 -> 1.3.1
parents ce19e23b 2316bf39

pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix

+8 −7
Original line number Diff line number Diff line 
{ lib

, stdenv

, fetchFromGitHub

, meson

, ninja

, cmake

, pkg-config

, wayland-scanner

, makeWrapper

, wrapQtAppsHook

, hyprland-protocols

, hyprlang

, libdrm

, mesa

, pipewire
@@ -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
@@ -43,6 +43,7 @@ stdenv.mkDerivation (self: { 


  buildInputs = [

    hyprland-protocols

    hyprlang

    libdrm

    mesa

    pipewire
@@ -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; {

pkgs/by-name/hy/hyprlang/package.nix

0 → 100644
+30 −0
Original line number Diff line number Diff line 
{

  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;

  };

})

pkgs/top-level/all-packages.nix

+4 −0
Original line number Diff line number Diff line
@@ -5701,6 +5701,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 { };