diff options
| author | Robin Gloster <mail@glob.in> | 2016-02-19 21:16:14 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-02-19 21:16:14 +0000 |
| commit | bc21db36925af6b79b070d6259c942b5b51239de (patch) | |
| tree | 5489c46ac6a1f101cff9e9b46febcf7bead80404 /pkgs/applications/networking/instant-messengers | |
| parent | ea84b3a915987edea0fca8545b0136867da16844 (diff) | |
| parent | 5ea21d69f5312db17f9a9d98e439ad1f22d80f73 (diff) | |
| download | nixlib-bc21db36925af6b79b070d6259c942b5b51239de.tar nixlib-bc21db36925af6b79b070d6259c942b5b51239de.tar.gz nixlib-bc21db36925af6b79b070d6259c942b5b51239de.tar.bz2 nixlib-bc21db36925af6b79b070d6259c942b5b51239de.tar.lz nixlib-bc21db36925af6b79b070d6259c942b5b51239de.tar.xz nixlib-bc21db36925af6b79b070d6259c942b5b51239de.tar.zst nixlib-bc21db36925af6b79b070d6259c942b5b51239de.zip | |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/applications/networking/instant-messengers')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/ricochet/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/tkabber/default.nix | 6 |
2 files changed, 3 insertions, 7 deletions
diff --git a/pkgs/applications/networking/instant-messengers/ricochet/default.nix b/pkgs/applications/networking/instant-messengers/ricochet/default.nix index 89487e5bf27e..81e8d1b76a9c 100644 --- a/pkgs/applications/networking/instant-messengers/ricochet/default.nix +++ b/pkgs/applications/networking/instant-messengers/ricochet/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "ricochet-${version}"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { url = "https://github.com/ricochet-im/ricochet/archive/v${version}.tar.gz"; - sha256 = "0y79igzgl9xn00981zcyxdlks7vnqxhb4rq3x8gwxm0yr98p39ms"; + sha256 = "1szb5vmlqal0vhan87kgbks184f7xbfay1hr3d3vm8r1lvcjjfkr"; }; desktopItem = makeDesktopItem { diff --git a/pkgs/applications/networking/instant-messengers/tkabber/default.nix b/pkgs/applications/networking/instant-messengers/tkabber/default.nix index f9209f28cf20..9c84e60601bb 100644 --- a/pkgs/applications/networking/instant-messengers/tkabber/default.nix +++ b/pkgs/applications/networking/instant-messengers/tkabber/default.nix @@ -40,11 +40,7 @@ let } // removeAttrs attrs [ "name" "sha256" ]); in mkTkabber (main // { - postPatch = '' - substituteInPlace login.tcl --replace \ - "custom::defvar loginconf(sslcacertstore) \"\"" \ - "custom::defvar loginconf(sslcacertstore) \$env(SSL_CERT_FILE)" - '' + optionalString (theme != null) '' + postPatch = optionalString (theme != null) '' themePath="$out/share/doc/tkabber/examples/xrdb/${theme}.xrdb" sed -i '/^if.*load_default_xrdb/,/^}$/ { s@option readfile \(\[fullpath [^]]*\]\)@option readfile "'"$themePath"'"@ |