diff options
author | Vladimír Čunát <v@cunat.cz> | 2024-04-12 07:06:54 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2024-04-12 07:06:54 +0200 |
commit | 24d4f2cd52fc44f375e60ab4c90e159193689d72 (patch) | |
tree | 113c1984373abdd81ca189e25fa76396a55706bc /pkgs/applications/networking/instant-messengers | |
parent | 4cfc319ea877f057cb7ad0c455c6af52e72bc557 (diff) | |
parent | 993400aeecf5ce185586dded2cebccebd628ec93 (diff) |
Merge branch 'staging' into staging-next
Conflicts (tried to quickly resolve somehow, checked eval): pkgs/development/python-modules/apsw/default.nix pkgs/development/python-modules/mido/default.nix pkgs/development/python-modules/pytest-bdd/default.nix pkgs/development/python-modules/sparse/default.nix
Diffstat (limited to 'pkgs/applications/networking/instant-messengers')
-rw-r--r-- | pkgs/applications/networking/instant-messengers/zoom-us/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 5c96be3bb82e1..cdf8f4f886d60 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -179,7 +179,7 @@ stdenv.mkDerivation rec { --prefix PATH : ${lib.makeBinPath [ coreutils glib.dev pciutils procps util-linux ]} \ --prefix LD_LIBRARY_PATH ":" ${libs} - # Backwards compatiblity: we used to call it zoom-us + # Backwards compatibility: we used to call it zoom-us ln -s $out/bin/{zoom,zoom-us} ''; |