lol

Merge pull request #27132 from gnidorah/rambox

rambox: 0.5.9 -> 0.5.10

authored by

Tim Steinbach and committed by
GitHub
eba93076 c22bf27f

+26 -26
+12 -12
pkgs/applications/networking/instant-messengers/franz/default.nix
··· 8 8 9 9 version = "4.0.4"; 10 10 11 + runtimeDeps = [ 12 + udev libnotify 13 + ]; 14 + deps = (with xorg; [ 15 + libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes 16 + libXrender libX11 libXtst libXScrnSaver 17 + ]) ++ [ 18 + gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus 19 + gnome2.GConf nss nspr alsaLib cups expat stdenv.cc.cc 20 + ] ++ runtimeDeps; 21 + 11 22 desktopItem = makeDesktopItem rec { 12 23 name = "Franz"; 13 24 exec = name; ··· 28 39 # don't remove runtime deps 29 40 dontPatchELF = true; 30 41 31 - deps = (with xorg; [ 32 - libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes 33 - libXrender libX11 libXtst libXScrnSaver 34 - ]) ++ [ 35 - gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus 36 - gnome2.GConf nss nspr alsaLib cups expat stdenv.cc.cc 37 - # runtime deps 38 - ] ++ [ 39 - udev libnotify 40 - ]; 41 - 42 42 unpackPhase = '' 43 43 tar xzf $src 44 44 ''; ··· 65 65 description = "A free messaging app that combines chat & messaging services into one application"; 66 66 homepage = http://meetfranz.com; 67 67 license = licenses.free; 68 - maintainers = [ stdenv.lib.maintainers.gnidorah ]; 68 + maintainers = [ maintainers.gnidorah ]; 69 69 platforms = ["i686-linux" "x86_64-linux"]; 70 70 hydraPlatforms = []; 71 71 };
+14 -14
pkgs/applications/networking/instant-messengers/rambox/default.nix
··· 6 6 bits = if stdenv.system == "x86_64-linux" then "x64" 7 7 else "ia32"; 8 8 9 - version = "0.5.9"; 9 + version = "0.5.10"; 10 + 11 + runtimeDeps = [ 12 + udev libnotify 13 + ]; 14 + deps = (with xorg; [ 15 + libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes 16 + libXrender libX11 libXtst libXScrnSaver libxcb 17 + ]) ++ [ 18 + gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus 19 + gnome2.GConf nss nspr alsaLib cups expat stdenv.cc.cc 20 + ] ++ runtimeDeps; 10 21 11 22 myIcon = fetchurl { 12 23 url = "https://raw.githubusercontent.com/saenzramiro/rambox/9e4444e6297dd35743b79fe23f8d451a104028d5/resources/Icon.png"; ··· 25 36 src = fetchurl { 26 37 url = "https://github.com/saenzramiro/rambox/releases/download/${version}/Rambox-${version}-${bits}.tar.gz"; 27 38 sha256 = if bits == "x64" then 28 - "0wx1cj3h1h28lhvl8ysmvr2wxq39lklk37361i598vph2pvnibi0" else 29 - "1dqjd5rmml63h3y43n1r68il3pn8zwy0wwr0866cnpizsbis96fy"; 39 + "1i5jbhsfdbhr0rsb5w2pfpwjiagz47ppxk65qny3ay3lr4lbccn3" else 40 + "1p1m6vsa9xvl3pjf3pygvllyk7j4q9vnlzmrizb8f5q30fpls25x"; 30 41 }; 31 42 32 43 # don't remove runtime deps 33 44 dontPatchELF = true; 34 - 35 - deps = (with xorg; [ 36 - libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes 37 - libXrender libX11 libXtst libXScrnSaver libxcb 38 - ]) ++ [ 39 - gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus 40 - gnome2.GConf nss nspr alsaLib cups expat stdenv.cc.cc 41 - # runtime deps 42 - ] ++ [ 43 - udev libnotify 44 - ]; 45 45 46 46 installPhase = '' 47 47 patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" rambox