Merge pull request #329152 from iynaix/bump-xdg-hyprlandd
xdg-desktop-portal-hyprland: 1.3.2 -> 1.3.3
This commit is contained in:
@@ -1,48 +1,41 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, pkg-config
|
||||
, wayland-scanner
|
||||
, makeWrapper
|
||||
, wrapQtAppsHook
|
||||
, hyprland-protocols
|
||||
, hyprlang
|
||||
, libdrm
|
||||
, mesa
|
||||
, pipewire
|
||||
, qtbase
|
||||
, qttools
|
||||
, qtwayland
|
||||
, sdbus-cpp
|
||||
, systemd
|
||||
, wayland
|
||||
, wayland-protocols
|
||||
, hyprland
|
||||
, hyprpicker
|
||||
, slurp
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
cmake,
|
||||
pkg-config,
|
||||
wayland-scanner,
|
||||
makeWrapper,
|
||||
wrapQtAppsHook,
|
||||
nix-update-script,
|
||||
hyprland-protocols,
|
||||
hyprlang,
|
||||
libdrm,
|
||||
mesa,
|
||||
pipewire,
|
||||
qtbase,
|
||||
qttools,
|
||||
qtwayland,
|
||||
sdbus-cpp,
|
||||
systemd,
|
||||
wayland,
|
||||
wayland-protocols,
|
||||
hyprland,
|
||||
hyprpicker,
|
||||
slurp,
|
||||
}:
|
||||
stdenv.mkDerivation (self: {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "xdg-desktop-portal-hyprland";
|
||||
version = "1.3.2";
|
||||
version = "1.3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hyprwm";
|
||||
repo = "xdg-desktop-portal-hyprland";
|
||||
rev = "v${self.version}";
|
||||
hash = "sha256-KsX7sAwkEFpXiwyjt0HGTnnrUU58wW1jlzj5IA/LRz8=";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-cyyxu/oj4QEFp3CVx2WeXa9T4OAUyynuBJHGkBZSxJI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# TODO: remove on next upgrade
|
||||
(fetchpatch {
|
||||
name = "fix-compilation-pipewire-1.2.0.patch";
|
||||
url = "https://github.com/hyprwm/xdg-desktop-portal-hyprland/commit/c5b30938710d6c599f3f5cd99a3ffac35381fb0f.patch";
|
||||
hash = "sha256-f9OgW9tLuGuHXYH6bR1Y+CEuBPHOhRiHfEPebJzlwK8=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
@@ -71,18 +64,33 @@ stdenv.mkDerivation (self: {
|
||||
postInstall = ''
|
||||
wrapProgramShell $out/bin/hyprland-share-picker \
|
||||
"''${qtWrapperArgs[@]}" \
|
||||
--prefix PATH ":" ${lib.makeBinPath [slurp hyprland]}
|
||||
--prefix PATH ":" ${
|
||||
lib.makeBinPath [
|
||||
slurp
|
||||
hyprland
|
||||
]
|
||||
}
|
||||
|
||||
wrapProgramShell $out/libexec/xdg-desktop-portal-hyprland \
|
||||
--prefix PATH ":" ${lib.makeBinPath [(placeholder "out") hyprpicker]}
|
||||
--prefix PATH ":" ${
|
||||
lib.makeBinPath [
|
||||
(placeholder "out")
|
||||
hyprpicker
|
||||
]
|
||||
}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/hyprwm/xdg-desktop-portal-hyprland";
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "xdg-desktop-portal backend for Hyprland";
|
||||
homepage = "https://github.com/hyprwm/xdg-desktop-portal-hyprland";
|
||||
changelog = "https://github.com/hyprwm/xdg-desktop-portal-hyprland/releases/tag/v${finalAttrs.version}";
|
||||
mainProgram = "hyprland-share-picker";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ fufexan ];
|
||||
platforms = platforms.linux;
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ fufexan ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user