nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-01 11:22:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #226407 from Mic92/ferdium

Browse Source 
ferdium: 6.2.4 -> 6.2.6
This commit is contained in:
Jörg Thalheim 2023-04-19 08:44:45 +01:00 committed by GitHub
commit 06dd8e56bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/applications/networking/instant-messengers/ferdium/default.nix
View File

@ -1,16 +1,22 @@
{ lib, mkFranzDerivation, fetchurl, xorg }:
{ lib, mkFranzDerivation, fetchurl, xorg, nix-update-script }:
mkFranzDerivation rec {
pname = "ferdium";
name = "Ferdium";
version = "6.2.4";
version = "6.2.6";
src = fetchurl {
url = "https://github.com/ferdium/ferdium-app/releases/download/v${version}/Ferdium-linux-${version}-amd64.deb";
sha256 = "sha256-iat0d06IhupMVYfK8Ot14gBY+5rHO4e/lVYqbX9ucIo=";
sha256 = "sha256-jG3NdolWqQzj/62jYwnqJHz5uT6QIuOkrpL/FcLl56k=";
};
extraBuildInputs = [ xorg.libxshmfence ];
passthru = {
updateScript = nix-update-script {
extraArgs = [ "--override-filename" ./default.nix ];
};
};
meta = with lib; {
description = "All your services in one place built by the community";
homepage = "https://ferdium.org/";

9
pkgs/applications/networking/instant-messengers/franz/generic.nix
View File

@ -28,9 +28,10 @@
# Helper function for building a derivation for Franz and forks.
{ pname, name, version, src, meta, extraBuildInputs ? [] }:
stdenv.mkDerivation rec {
{ pname, name, version, src, meta, extraBuildInputs ? [], ... } @ args:
let
cleanedArgs = builtins.removeAttrs args [ "pname" "name" "version" "src" "meta" "extraBuildInputs" ];
in stdenv.mkDerivation (rec {
inherit pname version src meta;
# Don't remove runtime deps.
@ -91,4 +92,4 @@ stdenv.mkDerivation rec {
--suffix PATH : ${xdg-utils}/bin \
"''${gappsWrapperArgs[@]}"
'';
}
} // cleanedArgs)