Update version to 2.0.32-fec7941 and apply proposed changes.

This commit is contained in:
John Ramsden 2017-06-01 00:06:20 -07:00
parent 1f10c1112a
commit 580f7b47a3

View File

@ -1,85 +1,84 @@
{ config { dpkg, fetchurl, lib, pkgs, stdenv, config
, stdenv
, pkgs
, fetchurl
, dpkg
, lib
, gnome2
, libgnome_keyring
, desktop_file_utils
, python2
, nodejs
, libnotify
, alsaLib , alsaLib
, atk , atk
, glib
, pango
, gdk_pixbuf
, cairo , cairo
, freetype
, fontconfig
, dbus
, nss
, nspr
, cups
, expat
, wget
, udev
, xorg
, libgcrypt
, makeWrapper
, gcc-unwrapped
, coreutils , coreutils
, cups
, dbus
, desktop_file_utils
, expat
, fontconfig
, freetype
, gcc-unwrapped
, gdk_pixbuf
, glib
, gnome2
, libgcrypt
, libgnome_keyring
, libnotify
, makeWrapper
, nodejs
, nspr
, nss
, pango
, python2
, udev
, wget
, xorg
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pkgname}-${version}"; name = "${pkgname}-${version}";
pkgname = "nylas-mail"; pkgname = "nylas-mail";
version = "2.0.31"; version = "2.0.32";
subVersion = "e675deb"; subVersion = "fec7941";
src = fetchurl { src =
if stdenv.system == "x86_64-linux" then
fetchurl {
url = "https://edgehill.s3-us-west-2.amazonaws.com/${version}-${subVersion}/linux-deb/x64/NylasMail.deb"; url = "https://edgehill.s3-us-west-2.amazonaws.com/${version}-${subVersion}/linux-deb/x64/NylasMail.deb";
sha256 = "b036956174f998bd4a2662a1f59cb4a302465b3ed06c487de88ff2721e372f6e"; sha256 = "40060aa1dc3b5187b8ed4a07b9de3427e3c5a291df98c2c82395647fa2aa4ada";
}; }
else
throw "NylasMail is not supported on ${stdenv.system}";
# Build dependencies # Build dependencies
propagatedBuildInputs = [ propagatedBuildInputs = [
gnome2.gtk
gnome2.GConf
libgnome_keyring
desktop_file_utils
python2
nodejs
libnotify
alsaLib alsaLib
atk atk
glib
pango
gdk_pixbuf
cairo cairo
freetype
fontconfig
dbus
nss
nspr
cups
expat
wget
udev
gcc-unwrapped
coreutils coreutils
cups
dbus
desktop_file_utils
expat
fontconfig
freetype
gcc-unwrapped
gdk_pixbuf
glib
gnome2.GConf
gnome2.gtk
libgnome_keyring
libnotify
nodejs
nspr
nss
pango
python2
udev
wget
xorg.libX11
xorg.libXScrnSaver xorg.libXScrnSaver
xorg.libXi xorg.libXcomposite
xorg.libXtst
xorg.libXcursor xorg.libXcursor
xorg.libXdamage xorg.libXdamage
xorg.libXrandr
xorg.libXcomposite
xorg.libXext xorg.libXext
xorg.libXfixes xorg.libXfixes
xorg.libXi
xorg.libXrandr
xorg.libXrender xorg.libXrender
xorg.libX11 xorg.libXtst
xorg.libxkbfile xorg.libxkbfile
]; ];
@ -122,8 +121,7 @@ stdenv.mkDerivation rec {
wrapProgram $out/share/nylas-mail/resources/apm/bin/apm \ wrapProgram $out/share/nylas-mail/resources/apm/bin/apm \
--set PATH "${coreutils}/bin" --set PATH "${coreutils}/bin"
patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath ${gcc-unwrapped.lib}/lib \ --set-rpath ${gcc-unwrapped.lib}/lib $out/share/nylas-mail/resources/apm/bin/node
$out/share/nylas-mail/resources/apm/bin/node
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {
@ -134,5 +132,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl3; license = licenses.gpl3;
maintainers = with maintainers; [ johnramsden ]; maintainers = with maintainers; [ johnramsden ];
homepage = https://nylas.com; homepage = https://nylas.com;
platforms = [ "x86_64-linux" ];
}; };
} }