diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-08-25 14:57:11 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-08-25 14:57:11 +0200 |
| commit | 985d1ac425735963d396e1c09dd49ad111813649 (patch) | |
| tree | 38a90f65d3bf5906ef020ef2c9482565325e850e /pkgs/applications/networking/irc | |
| parent | bc238b8df55bad9d8a436e120615cc5cfbbb78dc (diff) | |
| parent | f188bad6eaf26ebee19d02df03b1c6ae56c4d7f6 (diff) | |
| download | nixlib-985d1ac425735963d396e1c09dd49ad111813649.tar nixlib-985d1ac425735963d396e1c09dd49ad111813649.tar.gz nixlib-985d1ac425735963d396e1c09dd49ad111813649.tar.bz2 nixlib-985d1ac425735963d396e1c09dd49ad111813649.tar.lz nixlib-985d1ac425735963d396e1c09dd49ad111813649.tar.xz nixlib-985d1ac425735963d396e1c09dd49ad111813649.tar.zst nixlib-985d1ac425735963d396e1c09dd49ad111813649.zip | |
Merge branch 'master' into staging-next
There were several more conflicts from name -> pname+version; all auto-solved by kdiff3, hopefully OK. Hydra nixpkgs: ?compare=1538611
Diffstat (limited to 'pkgs/applications/networking/irc')
3 files changed, 41 insertions, 3 deletions
diff --git a/pkgs/applications/networking/irc/irccloud/default.nix b/pkgs/applications/networking/irc/irccloud/default.nix new file mode 100644 index 000000000000..5648d027d9e2 --- /dev/null +++ b/pkgs/applications/networking/irc/irccloud/default.nix @@ -0,0 +1,38 @@ +{ appimageTools, fetchurl, lib }: + +let + pname = "irccloud"; + version = "0.13.0"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "https://github.com/irccloud/irccloud-desktop/releases/download/v${version}/IRCCloud-${version}-linux-x86_64.AppImage"; + sha256 = "0ff69m5jav2c90918avsr5wvik2gds3klij3dzhkb352fgrd1s0l"; + }; + + appimageContents = appimageTools.extractType2 { + inherit name src; + }; + +in appimageTools.wrapType2 rec { + inherit name src; + + extraPkgs = pkgs: with pkgs; [ at-spi2-core ]; + + extraInstallCommands = '' + mv $out/bin/${name} $out/bin/${pname} + install -m 444 -D ${appimageContents}/irccloud.desktop $out/share/applications/irccloud.desktop + install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/512x512/apps/irccloud.png \ + $out/share/icons/hicolor/512x512/apps/irccloud.png + substituteInPlace $out/share/applications/irccloud.desktop \ + --replace 'Exec=AppRun' 'Exec=${pname}' + ''; + + meta = with lib; { + description = "A desktop client for IRCCloud"; + homepage = "https://www.irccloud.com"; + license = licenses.asl20; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ lightbulbjim ]; + }; +} diff --git a/pkgs/applications/networking/irc/weechat/scripts/default.nix b/pkgs/applications/networking/irc/weechat/scripts/default.nix index 439e0e116141..cd9ecbf43370 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/default.nix @@ -6,7 +6,7 @@ }; weechat-matrix-bridge = callPackage ./weechat-matrix-bridge { - inherit (luaPackages) cjson; + inherit (luaPackages) cjson luaffi; }; wee-slack = callPackage ./wee-slack { diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix index 233fe418df3a..ea5052f37a3f 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix @@ -31,9 +31,9 @@ stdenv.mkDerivation { mkdir -p $out/{share,lib} cp {matrix.lua,olm.lua} $out/share - cp ${cjson}/lib/lua/5.2/cjson.so $out/lib/cjson.so + cp ${cjson}/lib/lua/${cjson.lua.luaversion}/cjson.so $out/lib/cjson.so cp ${olm}/lib/libolm.so $out/lib/libolm.so - cp ${luaffi}/lib/ffi.so $out/lib/ffi.so + cp ${luaffi}/lib/lua/${luaffi.lua.luaversion}/ffi.so $out/lib/ffi.so ''; meta = with stdenv.lib; { |