Merge pull request #125723 from Ma27/bump-ferdi
ferdi: 5.6.0-beta.5 -> 5.6.0-beta.6, improve XWayland support
This commit is contained in:
commit
6acaea67cf
2 changed files with 23 additions and 7 deletions
|
@ -1,18 +1,33 @@
|
|||
{ lib, mkFranzDerivation, fetchurl }:
|
||||
{ lib, mkFranzDerivation, fetchurl, xorg, xdg-utils, buildEnv, writeShellScriptBin }:
|
||||
|
||||
mkFranzDerivation rec {
|
||||
let
|
||||
mkFranzDerivation' = mkFranzDerivation.override {
|
||||
xdg-utils = buildEnv {
|
||||
name = "xdg-utils-for-ferdi";
|
||||
paths = [
|
||||
xdg-utils
|
||||
(lib.hiPrio (writeShellScriptBin "xdg-open" ''
|
||||
unset GDK_BACKEND
|
||||
exec ${xdg-utils}/bin/xdg-open "$@"
|
||||
''))
|
||||
];
|
||||
};
|
||||
};
|
||||
in
|
||||
mkFranzDerivation' rec {
|
||||
pname = "ferdi";
|
||||
name = "Ferdi";
|
||||
version = "5.6.0-beta.5";
|
||||
version = "5.6.0-beta.6";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/getferdi/ferdi/releases/download/v${version}/ferdi_${version}_amd64.deb";
|
||||
sha256 = "sha256-fDUzYir53OQ3O4o9eG70sGD+FJ0/4SDNsTfh97WFRnQ=";
|
||||
sha256 = "sha256-Q1HSAEVcaxFyOq7oWqa6AJJpsBKRxbsKb9ydyK/gH/A=";
|
||||
};
|
||||
extraBuildInputs = [ xorg.libxshmfence ];
|
||||
meta = with lib; {
|
||||
description = "Combine your favorite messaging services into one application";
|
||||
homepage = "https://getferdi.com/";
|
||||
license = licenses.asl20;
|
||||
maintainers = [ maintainers.davidtwco ];
|
||||
maintainers = with maintainers; [ davidtwco ma27 ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
hydraPlatforms = [ ];
|
||||
};
|
||||
|
|
|
@ -28,7 +28,8 @@
|
|||
|
||||
# Helper function for building a derivation for Franz and forks.
|
||||
|
||||
{ pname, name, version, src, meta }:
|
||||
{ pname, name, version, src, meta, extraBuildInputs ? [] }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
inherit pname version src meta;
|
||||
|
||||
|
@ -36,7 +37,7 @@ stdenv.mkDerivation rec {
|
|||
dontPatchELF = true;
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook makeWrapper wrapGAppsHook dpkg ];
|
||||
buildInputs = (with xorg; [
|
||||
buildInputs = extraBuildInputs ++ (with xorg; [
|
||||
libXi
|
||||
libXcursor
|
||||
libXdamage
|
||||
|
|
Loading…
Reference in a new issue