Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 63dd41f745e7
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 75b469241bcf
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 27, 2020

  1. gitter: 4.1.0 -> 5.0.1 

    Just an update to the underlying package version.
    @GrafBlutwurst @SuperSandro2000
    GrafBlutwurst authored and SuperSandro2000 committed Nov 27, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    vszakats Viktor Szakats
    GPG key ID: B5ABD165E2AEF201
    Verified
    Learn about vigilant mode
    Copy the full SHA
    00afc85 View commit details

  2. Merge pull request #96292 from GrafBlutwurst/update-gitter

    @SuperSandro2000
    SuperSandro2000 authored Nov 27, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    vszakats Viktor Szakats
    GPG key ID: B5ABD165E2AEF201
    Verified
    Learn about vigilant mode
    Copy the full SHA
    75b4692 View commit details
Showing with 43 additions and 11 deletions.
  1. +43 −11 pkgs/applications/networking/instant-messengers/gitter/default.nix
54 changes: 43 additions & 11 deletions pkgs/applications/networking/instant-messengers/gitter/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,29 +1,61 @@
{ stdenv, alsaLib, atk, cairo, cups, dbus, dpkg, expat, fetchurl
, fontconfig, freetype, gdk-pixbuf, glib, gnome2, gtk3, libX11
{ stdenv, alsaLib, atk, at-spi2-core, cairo, cups, dbus, dpkg, expat, fetchurl
, fontconfig, freetype, gdk-pixbuf, glib, gnome2, gtk3, libdrm, libX11
, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext, libXfixes
, libXi, libXrandr, libXrender, libXtst, libappindicator-gtk3, libcxx
, libnotify, libpulseaudio, libxcb, makeDesktopItem, makeWrapper, nspr, nss
, libnotify, libpulseaudio, libxcb, makeDesktopItem, makeWrapper, mesa, nspr, nss
, pango, systemd }:

let gitterDirectorySuffix = "opt/gitter";
libPath = stdenv.lib.makeLibraryPath [
alsaLib
atk
at-spi2-core
cairo
cups
dbus
expat
fontconfig
freetype
gdk-pixbuf
glib
gnome2.GConf
gtk3
libX11
libXScrnSaver
libXcomposite
libXcursor
libXdamage
libXext
libXfixes
libXi
libXrandr
libXrender
libXtst
libappindicator-gtk3
libcxx
libdrm
libnotify
libpulseaudio
libxcb
mesa
nspr
nss
pango
stdenv.cc.cc
systemd
];
doELFPatch = target: ''
patchelf --set-interpreter ${stdenv.cc.bintools.dynamicLinker} \
--set-rpath "$out/${gitterDirectorySuffix}/lib:${libPath}" \
$out/${gitterDirectorySuffix}/${target}
'';
libPath = stdenv.lib.makeLibraryPath [
alsaLib atk cairo cups dbus expat fontconfig freetype gdk-pixbuf glib
gnome2.GConf gtk3 libX11 libXScrnSaver libXcomposite libXcursor libXdamage
libXext libXfixes libXi libXrandr libXrender libXtst libappindicator-gtk3
libcxx libnotify libpulseaudio libxcb nspr nss pango stdenv.cc.cc systemd
];
in stdenv.mkDerivation rec {
pname = "gitter";
version = "4.1.0";
version = "5.0.1";

src = fetchurl {
url = "https://update.gitter.im/linux64/${pname}_${version}_amd64.deb";
sha256 = "1gny9i2pywvczzrs93k8krqn6hwm6c2zg8yr3xmjqs3p88817wbi";
sha256 = "1ps9akylqrril4902r8mi0mprm0hb5wra51ry6c1rb5xz5nrzgh1";
};

nativeBuildInputs = [ makeWrapper dpkg ];