mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-11-06 02:06:46 +01:00
Merge pull request #127914 from ymatsiuk/slack
slack: fix missing libGLESv2.so.2
This commit is contained in:
commit
bf2a9ccb7e
|
@ -1,4 +1,5 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, dpkg
|
||||
, undmg
|
||||
|
@ -19,6 +20,7 @@
|
|||
, glib
|
||||
, gnome2
|
||||
, gtk3
|
||||
, libGL
|
||||
, libappindicator-gtk3
|
||||
, libdrm
|
||||
, libnotify
|
||||
|
@ -53,18 +55,20 @@ let
|
|||
x86_64-linux = x86_64-linux-version;
|
||||
}.${system} or throwSystem;
|
||||
|
||||
src = let
|
||||
base = "https://downloads.slack-edge.com";
|
||||
in {
|
||||
x86_64-darwin = fetchurl {
|
||||
url = "${base}/releases/macos/${version}/prod/x64/Slack-${version}-macOS.dmg";
|
||||
sha256 = x86_64-darwin-sha256;
|
||||
};
|
||||
x86_64-linux = fetchurl {
|
||||
url = "${base}/linux_releases/slack-desktop-${version}-amd64.deb";
|
||||
sha256 = x86_64-linux-sha256;
|
||||
};
|
||||
}.${system} or throwSystem;
|
||||
src =
|
||||
let
|
||||
base = "https://downloads.slack-edge.com";
|
||||
in
|
||||
{
|
||||
x86_64-darwin = fetchurl {
|
||||
url = "${base}/releases/macos/${version}/prod/x64/Slack-${version}-macOS.dmg";
|
||||
sha256 = x86_64-darwin-sha256;
|
||||
};
|
||||
x86_64-linux = fetchurl {
|
||||
url = "${base}/linux_releases/slack-desktop-${version}-amd64.deb";
|
||||
sha256 = x86_64-linux-sha256;
|
||||
};
|
||||
}.${system} or throwSystem;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Desktop client for Slack";
|
||||
|
@ -95,6 +99,7 @@ let
|
|||
glib
|
||||
gnome2.GConf
|
||||
gtk3
|
||||
libGL
|
||||
libappindicator-gtk3
|
||||
libdrm
|
||||
libnotify
|
||||
|
@ -118,13 +123,13 @@ let
|
|||
xorg.libXi
|
||||
xorg.libXrandr
|
||||
xorg.libXrender
|
||||
xorg.libxshmfence
|
||||
xorg.libXtst
|
||||
xorg.libxkbfile
|
||||
xorg.libxshmfence
|
||||
] + ":${stdenv.cc.cc.lib}/lib64";
|
||||
|
||||
buildInputs = [
|
||||
gtk3 # needed for GSETTINGS_SCHEMAS_PATH
|
||||
gtk3 # needed for GSETTINGS_SCHEMAS_PATH
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ dpkg makeWrapper nodePackages.asar ];
|
||||
|
@ -153,7 +158,7 @@ let
|
|||
rm $out/bin/slack
|
||||
makeWrapper $out/lib/slack/slack $out/bin/slack \
|
||||
--prefix XDG_DATA_DIRS : $GSETTINGS_SCHEMAS_PATH \
|
||||
--prefix PATH : ${xdg-utils}/bin
|
||||
--prefix PATH : ${lib.makeBinPath [xdg-utils]}
|
||||
|
||||
# Fix the desktop link
|
||||
substituteInPlace $out/share/applications/slack.desktop \
|
||||
|
@ -177,6 +182,7 @@ let
|
|||
/usr/bin/defaults write com.tinyspeck.slackmacgap SlackNoAutoUpdates -bool YES
|
||||
'';
|
||||
};
|
||||
in if stdenv.isDarwin
|
||||
then darwin
|
||||
else linux
|
||||
in
|
||||
if stdenv.isDarwin
|
||||
then darwin
|
||||
else linux
|
||||
|
|
Loading…
Reference in a new issue