diff options
author | Jörg Thalheim <joerg@higgsboson.tk> | 2016-10-03 19:37:52 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-03 19:37:52 +0200 |
commit | 58b6c8407111a8b6b886964387ad753fd4972ab3 (patch) | |
tree | efefc9c26d6aa88c2049801d6e226c487ee23a20 | |
parent | 008344b29a9dceb35b3ef78fe759875aba6cab9b (diff) | |
parent | 4e449d0159d95213380bc8b38859314aa09447fe (diff) | |
download | nixlib-58b6c8407111a8b6b886964387ad753fd4972ab3.tar nixlib-58b6c8407111a8b6b886964387ad753fd4972ab3.tar.gz nixlib-58b6c8407111a8b6b886964387ad753fd4972ab3.tar.bz2 nixlib-58b6c8407111a8b6b886964387ad753fd4972ab3.tar.lz nixlib-58b6c8407111a8b6b886964387ad753fd4972ab3.tar.xz nixlib-58b6c8407111a8b6b886964387ad753fd4972ab3.tar.zst nixlib-58b6c8407111a8b6b886964387ad753fd4972ab3.zip |
Merge pull request #19197 from gnidorah/master
Add Rambox and Franz messengers
-rw-r--r-- | lib/maintainers.nix | 1 | ||||
-rw-r--r-- | pkgs/applications/networking/instant-messengers/franz/default.nix | 49 | ||||
-rw-r--r-- | pkgs/applications/networking/instant-messengers/rambox/default.nix | 45 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
4 files changed, 99 insertions, 0 deletions
diff --git a/lib/maintainers.nix b/lib/maintainers.nix index cb8607cb199c..d94bc265bdd9 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -167,6 +167,7 @@ giogadi = "Luis G. Torres <lgtorres42@gmail.com>"; gleber = "Gleb Peregud <gleber.p@gmail.com>"; globin = "Robin Gloster <mail@glob.in>"; + gnidorah = "Alex Ivanov <yourbestfriend@opmbx.org>"; goibhniu = "Cillian de Róiste <cillian.deroiste@gmail.com>"; Gonzih = "Max Gonzih <gonzih@gmail.com>"; gpyh = "Yacine Hmito <yacine.hmito@gmail.com>"; diff --git a/pkgs/applications/networking/instant-messengers/franz/default.nix b/pkgs/applications/networking/instant-messengers/franz/default.nix new file mode 100644 index 000000000000..3686862527e5 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/franz/default.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchurl +, xorg, gtk2, atk, glib, pango, gdk_pixbuf, cairo, freetype, fontconfig +, gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify }: + +stdenv.mkDerivation rec { + bits = if stdenv.system == "x86_64-linux" then "x64" + else "ia32"; + version = "4.0.4"; + name = "franz-${version}"; + src = fetchurl { + url = "https://github.com/meetfranz/franz-app/releases/download/4.0.4/Franz-linux-${bits}-${version}.tgz"; + sha256 = if bits == "x64" then + "0ssym0jfrig474g6j67g1jfybjkxnyhbqqjvrs8z6ihwlyd3rrk5" else + "16l9jma2hiwzl9l41yhrwribcgmxca271rq0cfbbm9701mmmciyy"; + }; + + phases = [ "unpackPhase" "installPhase" ]; + + deps = with xorg; [ + gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus + libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes + libXrender libX11 libXtst libXScrnSaver gnome2.GConf nss nspr alsaLib + cups expat stdenv.cc.cc + + udev libnotify + ]; + + unpackPhase = '' + tar xzf $src + ''; + + installPhase = '' + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" Franz + patchelf --set-rpath "$out/share/franz:${stdenv.lib.makeLibraryPath deps}" Franz + + mkdir -p $out/bin $out/share/franz + cp -r * $out/share/franz + ln -s $out/share/franz/Franz $out/bin + ''; + + meta = with stdenv.lib; { + description = "A free messaging app that combines chat & messaging services into one application"; + homepage = http://meetfranz.com; + license = licenses.free; + maintainers = [ stdenv.lib.maintainers.gnidorah ]; + platforms = ["i686-linux" "x86_64-linux"]; + hydraPlatforms = []; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix new file mode 100644 index 000000000000..802c814dbac6 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchurl +, xorg, gtk2, atk, glib, pango, gdk_pixbuf, cairo, freetype, fontconfig +, gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify }: + +stdenv.mkDerivation rec { + bits = if stdenv.system == "x86_64-linux" then "x64" + else "ia32"; + version = "0.4.4"; + name = "rambox-${version}"; + src = fetchurl { + url = "https://github.com/saenzramiro/rambox/releases/download/${version}/Rambox-${version}-${bits}.tar.gz"; + sha256 = if bits == "x64" then + "05xwabwij7fyifrypahcplymz46k01rzrwgp5gn79hh023w259i0" else + "16j17rc8mld96mq1rxnwmxwfa2q5b44s40c56mwh34plqyn546l2"; + }; + + phases = [ "unpackPhase" "installPhase" ]; + + deps = with xorg; [ + gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus + libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes + libXrender libX11 libXtst libXScrnSaver gnome2.GConf nss nspr alsaLib + cups expat stdenv.cc.cc + + udev libnotify + ]; + + installPhase = '' + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" Rambox + patchelf --set-rpath "$out/share/rambox:${stdenv.lib.makeLibraryPath deps}" Rambox + + mkdir -p $out/bin $out/share/rambox + cp -r * $out/share/rambox + ln -s $out/share/rambox/Rambox $out/bin + ''; + + meta = with stdenv.lib; { + description = "Free and Open Source messaging and emailing app that combines common web applications into one"; + homepage = http://rambox.pro; + license = licenses.mit; + maintainers = [ stdenv.lib.maintainers.gnidorah ]; + platforms = ["i686-linux" "x86_64-linux"]; + hydraPlatforms = []; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a56f46c37767..61e68f17119d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1680,6 +1680,8 @@ in fprint_demo = callPackage ../tools/security/fprint_demo { }; + franz = callPackage ../applications/networking/instant-messengers/franz { }; + freeipmi = callPackage ../tools/system/freeipmi {}; freetalk = callPackage ../applications/networking/instant-messengers/freetalk { }; @@ -3350,6 +3352,8 @@ in radvd = callPackage ../tools/networking/radvd { }; + rambox = callPackage ../applications/networking/instant-messengers/rambox { }; + ranger = callPackage ../applications/misc/ranger { }; rarcrack = callPackage ../tools/security/rarcrack { }; |