diff options
author | David Wood <david@davidtw.co> | 2020-11-17 12:05:15 +0000 |
---|---|---|
committer | David Wood <david@davidtw.co> | 2020-11-17 12:05:15 +0000 |
commit | d1fb8eaeb197eb604943e7458863102f478e4ed0 (patch) | |
tree | 67ebf6814b03cc5b231f58ba873e09a34855980f /pkgs/applications/networking/instant-messengers | |
parent | b6deb94192cd95990a0f6ce2c4ad1253c5a5cf7f (diff) | |
download | nixlib-d1fb8eaeb197eb604943e7458863102f478e4ed0.tar nixlib-d1fb8eaeb197eb604943e7458863102f478e4ed0.tar.gz nixlib-d1fb8eaeb197eb604943e7458863102f478e4ed0.tar.bz2 nixlib-d1fb8eaeb197eb604943e7458863102f478e4ed0.tar.lz nixlib-d1fb8eaeb197eb604943e7458863102f478e4ed0.tar.xz nixlib-d1fb8eaeb197eb604943e7458863102f478e4ed0.tar.zst nixlib-d1fb8eaeb197eb604943e7458863102f478e4ed0.zip |
franz: 5.5.0 -> 5.6.1
Diffstat (limited to 'pkgs/applications/networking/instant-messengers')
-rw-r--r-- | pkgs/applications/networking/instant-messengers/franz/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/networking/instant-messengers/franz/generic.nix | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/applications/networking/instant-messengers/franz/default.nix b/pkgs/applications/networking/instant-messengers/franz/default.nix index 52bc60b5affd..646a790fed25 100644 --- a/pkgs/applications/networking/instant-messengers/franz/default.nix +++ b/pkgs/applications/networking/instant-messengers/franz/default.nix @@ -3,10 +3,10 @@ mkFranzDerivation rec { pname = "franz"; name = "Franz"; - version = "5.5.0"; + version = "5.6.1"; src = fetchurl { url = "https://github.com/meetfranz/franz/releases/download/v${version}/franz_${version}_amd64.deb"; - sha256 = "0kgfjai0pz0gpbxsmn3hbha7zr2kax0s1j3ygcsy4kzghla990wm"; + sha256 = "1gn0n1hr6z2gsdnpxysyq6sm8y7cjr9jafhsam8ffw0bq74kph7p"; }; meta = with stdenv.lib; { description = "A free messaging app that combines chat & messaging services into one application"; diff --git a/pkgs/applications/networking/instant-messengers/franz/generic.nix b/pkgs/applications/networking/instant-messengers/franz/generic.nix index 3f05e3d7a5d3..96865374bed1 100644 --- a/pkgs/applications/networking/instant-messengers/franz/generic.nix +++ b/pkgs/applications/networking/instant-messengers/franz/generic.nix @@ -28,7 +28,7 @@ # Helper function for building a derivation for Franz and forks. { pname, name, version, src, meta }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { inherit pname version src meta; # Don't remove runtime deps. @@ -65,7 +65,7 @@ stdenv.mkDerivation { expat stdenv.cc.cc ]; - runtimeDependencies = [ (lib.getLib udev) libnotify ]; + runtimeDependencies = [ stdenv.cc.cc.lib (lib.getLib udev) libnotify ]; unpackPhase = "dpkg-deb -x $src ."; @@ -84,6 +84,7 @@ stdenv.mkDerivation { postFixup = '' wrapProgram $out/opt/${name}/${pname} \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeDependencies}" \ --prefix PATH : ${xdg_utils}/bin \ "''${gappsWrapperArgs[@]}" ''; |