public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #104046 from davidtwco/franz-5.6.1

Browse Source 
franz: 5.5.0 -> 5.6.1
This commit is contained in:
Sandro 2020-11-25 12:24:53 +01:00 committed by GitHub
commit 960ee2bf68
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/networking/instant-messengers/franz/default.nix
View File

@ -3,10 +3,10 @@
mkFranzDerivation rec { mkFranzDerivation rec {
pname = "franz"; pname = "franz";
name = "Franz"; name = "Franz";
version = "5.5.0"; version = "5.6.1";
src = fetchurl { src = fetchurl {
url = "https://github.com/meetfranz/franz/releases/download/v${version}/franz_${version}_amd64.deb"; url = "https://github.com/meetfranz/franz/releases/download/v${version}/franz_${version}_amd64.deb";
sha256 = "0kgfjai0pz0gpbxsmn3hbha7zr2kax0s1j3ygcsy4kzghla990wm"; sha256 = "1gn0n1hr6z2gsdnpxysyq6sm8y7cjr9jafhsam8ffw0bq74kph7p";
}; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A free messaging app that combines chat & messaging services into one application"; description = "A free messaging app that combines chat & messaging services into one application";

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

@ -28,7 +28,7 @@
# Helper function for building a derivation for Franz and forks. # Helper function for building a derivation for Franz and forks.
{ pname, name, version, src, meta }: { pname, name, version, src, meta }:
stdenv.mkDerivation { stdenv.mkDerivation rec {
inherit pname version src meta; inherit pname version src meta;
# Don't remove runtime deps. # Don't remove runtime deps.
@ -65,7 +65,7 @@ stdenv.mkDerivation {
expat expat
stdenv.cc.cc stdenv.cc.cc
]; ];
runtimeDependencies = [ (lib.getLib udev) libnotify ]; runtimeDependencies = [ stdenv.cc.cc.lib (lib.getLib udev) libnotify ];
unpackPhase = "dpkg-deb -x $src ."; unpackPhase = "dpkg-deb -x $src .";
@ -84,6 +84,7 @@ stdenv.mkDerivation {
postFixup = '' postFixup = ''
wrapProgram $out/opt/${name}/${pname} \ wrapProgram $out/opt/${name}/${pname} \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeDependencies}" \
--prefix PATH : ${xdg_utils}/bin \ --prefix PATH : ${xdg_utils}/bin \
"''${gappsWrapperArgs[@]}" "''${gappsWrapperArgs[@]}"
''; '';