diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-01-01 15:09:55 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-01-01 15:09:55 +0100 |
| commit | 1869e7e5b0580e9398529dbebde7e983193c445e (patch) | |
| tree | 151a8b06d499551660d6621a05dc1cf25d89631a /pkgs/applications/networking | |
| parent | e92a133238aea65770556631bdff307855ecdc77 (diff) | |
| parent | 4d917639fb3c2959f058e533d5ebb2001e5b05fa (diff) | |
| download | nixlib-1869e7e5b0580e9398529dbebde7e983193c445e.tar nixlib-1869e7e5b0580e9398529dbebde7e983193c445e.tar.gz nixlib-1869e7e5b0580e9398529dbebde7e983193c445e.tar.bz2 nixlib-1869e7e5b0580e9398529dbebde7e983193c445e.tar.lz nixlib-1869e7e5b0580e9398529dbebde7e983193c445e.tar.xz nixlib-1869e7e5b0580e9398529dbebde7e983193c445e.tar.zst nixlib-1869e7e5b0580e9398529dbebde7e983193c445e.zip | |
Merge remote-tracking branch 'upstream/master' into HEAD
Diffstat (limited to 'pkgs/applications/networking')
| -rw-r--r-- | pkgs/applications/networking/browsers/google-chrome/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix | 9 |
2 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index bc8aca5b1702..b868c434e234 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -4,7 +4,7 @@ , glib, fontconfig, freetype, pango, cairo, libX11, libXi, atk, gconf, nss, nspr , libXcursor, libXext, libXfixes, libXrender, libXScrnSaver, libXcomposite, libxcb , alsaLib, libXdamage, libXtst, libXrandr, expat, cups -, dbus_libs, gtk2, gtk3, gdk_pixbuf, gcc-unwrapped +, dbus_libs, gtk2, gtk3, gdk_pixbuf, gcc-unwrapped, at_spi2_atk # command line arguments which are always set e.g "--disable-gpu" , commandLineArgs ? "" @@ -57,7 +57,7 @@ let libexif liberation_ttf curl utillinux xdg_utils wget flac harfbuzz icu libpng opusWithCustomModes snappy speechd - bzip2 libcap + bzip2 libcap at_spi2_atk ] ++ optional pulseSupport libpulseaudio ++ [ gtk ]; diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix index fd05948864c0..1477d0674642 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix @@ -2,13 +2,14 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "bitlbee-steam-2015-09-10"; + version = "1.4.2"; + name = "bitlbee-steam-${version}"; src = fetchFromGitHub { - rev = "011375b2d3c67c15d51ca203de0ecaab3b4b7587"; - owner = "jgeboski"; + rev = "v${version}"; + owner = "bitlbee"; repo = "bitlbee-steam"; - sha256 = "1m91x3208z9zxppz998i6060alcalfly9ix9jxismj45xyp6mdx7"; + sha256 = "121r92mgwv445wwxzh35n19fs5k81ihr0j19k256ia5502b1xxaq"; }; nativeBuildInputs = [ pkgconfig ]; |