[nextcloud-talk-desktop] Update to 0.39.0
This commit is contained in:
@@ -40,8 +40,6 @@
|
|||||||
./machines/z790prors/configuration.nix
|
./machines/z790prors/configuration.nix
|
||||||
{
|
{
|
||||||
home-manager.users.johno = import ./home/home-z790prors.nix;
|
home-manager.users.johno = import ./home/home-z790prors.nix;
|
||||||
home-manager.extraSpecialArgs.customPkgs =
|
|
||||||
nixpkgs.legacyPackages."${system}".callPackage ./packages {};
|
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
@@ -52,8 +50,6 @@
|
|||||||
./machines/nix-book/configuration.nix
|
./machines/nix-book/configuration.nix
|
||||||
{
|
{
|
||||||
home-manager.users.johno = import ./home/home-nix-book.nix;
|
home-manager.users.johno = import ./home/home-nix-book.nix;
|
||||||
home-manager.extraSpecialArgs.customPkgs =
|
|
||||||
nixpkgs.legacyPackages."${system}".callPackage ./packages {};
|
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
@@ -65,8 +61,6 @@
|
|||||||
inputs.home-manager.nixosModules.home-manager
|
inputs.home-manager.nixosModules.home-manager
|
||||||
{
|
{
|
||||||
home-manager.users.johno = import ./home/home-default.nix;
|
home-manager.users.johno = import ./home/home-default.nix;
|
||||||
home-manager.extraSpecialArgs.customPkgs =
|
|
||||||
nixpkgs.legacyPackages."${system}".callPackage ./packages {};
|
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,5 +1,8 @@
|
|||||||
{ pkgs, customPkgs, ... }:
|
{ pkgs, customPkgs, ... }:
|
||||||
|
|
||||||
|
let
|
||||||
|
customPkgs = pkgs.callPackage ../packages {};
|
||||||
|
in
|
||||||
{
|
{
|
||||||
# Home Manager needs a bit of information about you and the paths it should
|
# Home Manager needs a bit of information about you and the paths it should
|
||||||
# manage.
|
# manage.
|
||||||
|
|||||||
@@ -1,39 +1,40 @@
|
|||||||
{ lib
|
{
|
||||||
, stdenv
|
lib,
|
||||||
, fetchzip
|
stdenv,
|
||||||
, autoPatchelfHook
|
fetchzip,
|
||||||
|
autoPatchelfHook,
|
||||||
, nss
|
nss,
|
||||||
, cairo
|
cairo,
|
||||||
, xorg
|
xorg,
|
||||||
, libxkbcommon
|
libxkbcommon,
|
||||||
, alsa-lib
|
alsa-lib,
|
||||||
, at-spi2-core
|
at-spi2-core,
|
||||||
, mesa
|
mesa,
|
||||||
, pango
|
pango,
|
||||||
, libdrm
|
libdrm,
|
||||||
, vivaldi-ffmpeg-codecs
|
vivaldi-ffmpeg-codecs,
|
||||||
, gtk3
|
gtk3,
|
||||||
, libGL
|
libGL,
|
||||||
, libglvnd
|
libglvnd,
|
||||||
, systemd
|
systemd,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: rec {
|
||||||
pname = "nextcloud-talk-desktop";
|
pname = "nextcloud-talk-desktop";
|
||||||
version = "0.29.0";
|
version = "0.39.0";
|
||||||
|
|
||||||
# Building from source would require building also building Server and Talk components
|
# Building from source would require building also building Server and Talk components
|
||||||
# See https://github.com/nextcloud/talk-desktop?tab=readme-ov-file#%EF%B8%8F-prerequisites
|
# See https://github.com/nextcloud/talk-desktop?tab=readme-ov-file#%EF%B8%8F-prerequisites
|
||||||
src = fetchzip {
|
src = fetchzip {
|
||||||
url = "https://github.com/nextcloud-releases/talk-desktop/releases/download/v${finalAttrs.version}/Nextcloud.Talk-linux-x64-${finalAttrs.version}.zip";
|
url = "https://github.com/nextcloud-releases/talk-desktop/releases/download/v${finalAttrs.version}/Nextcloud.Talk-linux-x64-${finalAttrs.version}.zip";
|
||||||
hash = "sha256-fBIeNv8tfrVTFExLQDBPhIazvbsJ7a76+W9G0cuQDlw=";
|
hash = "sha256-f8X6I2Je9wgstMTuYGaX7AXAqpZC92RUAltDVsHr9Vo=";
|
||||||
stripRoot = false;
|
stripRoot = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ autoPatchelfHook ];
|
nativeBuildInputs = [ autoPatchelfHook ];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs =
|
||||||
|
[
|
||||||
nss
|
nss
|
||||||
cairo
|
cairo
|
||||||
alsa-lib
|
alsa-lib
|
||||||
@@ -46,7 +47,15 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
mesa
|
mesa
|
||||||
libGL
|
libGL
|
||||||
libglvnd
|
libglvnd
|
||||||
] ++ (with xorg; [libX11 libXcomposite libXdamage libXrandr libXfixes libXcursor]);
|
]
|
||||||
|
++ (with xorg; [
|
||||||
|
libX11
|
||||||
|
libXcomposite
|
||||||
|
libXdamage
|
||||||
|
libXrandr
|
||||||
|
libXfixes
|
||||||
|
libXcursor
|
||||||
|
]);
|
||||||
|
|
||||||
# Required to launch the application and proceed past the zygote_linux fork() process
|
# Required to launch the application and proceed past the zygote_linux fork() process
|
||||||
# Fixes `Zygote could not fork`
|
# Fixes `Zygote could not fork`
|
||||||
@@ -55,25 +64,23 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
preInstall = ''
|
preInstall = ''
|
||||||
mkdir -p $out/bin
|
mkdir -p $out/bin
|
||||||
mkdir -p $out/opt
|
mkdir -p $out/opt
|
||||||
|
|
||||||
cp -r $src/* $out/opt/
|
cp -r $src/* $out/opt/
|
||||||
'';
|
'';
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
runHook preInstall
|
runHook preInstall
|
||||||
|
|
||||||
# Link the application in $out/bin away from contents of `preInstall`
|
# Link the application in $out/bin away from contents of `preInstall`
|
||||||
ln -s "$out/opt/Nextcloud Talk-linux-x64/Nextcloud Talk" $out/bin/${finalAttrs.pname}
|
ln -s "$out/opt/Nextcloud Talk" $out/bin/nextcloud-talk-desktop
|
||||||
|
|
||||||
runHook postInstall
|
runHook postInstall
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Nextcloud Talk Desktop Client Preview";
|
description = "Nextcloud Talk Desktop Client";
|
||||||
homepage = "https://github.com/nextcloud/talk-desktop";
|
homepage = "https://github.com/nextcloud/talk-desktop";
|
||||||
changelog = "https://github.com/nextcloud/talk-desktop/blob/${finalAttrs.version}/CHANGELOG.md";
|
changelog = "https://github.com/nextcloud/talk-desktop/blob/${finalAttrs.version}/CHANGELOG.md";
|
||||||
license = licenses.agpl3Only;
|
license = licenses.agpl3Only;
|
||||||
maintainers = with maintainers; [ kashw2 ];
|
maintainers = with maintainers; [ kashw2 ];
|
||||||
mainProgram = finalAttrs.pname;
|
mainProgram = "nextcloud-talk-desktop";
|
||||||
|
sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
|
|||||||
Reference in New Issue
Block a user