public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #31095 from gnidorah/rambox

Browse Source 
rambox: 0.5.12 -> 0.5.13
This commit is contained in:
Jörg Thalheim 2017-11-02 08:30:32 +00:00 committed by GitHub
commit 6e90af6897
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/networking/instant-messengers/franz/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, makeDesktopItem { stdenv, fetchurl, makeDesktopItem, makeWrapper
, xorg, gtk2, atk, glib, pango, gdk_pixbuf, cairo, freetype, fontconfig , xorg, gtk2, atk, glib, pango, gdk_pixbuf, cairo, freetype, fontconfig
, gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify }: , gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify, xdg_utils }:
let let
bits = if stdenv.system == "x86_64-linux" then "x64" bits = if stdenv.system == "x86_64-linux" then "x64"
@ -39,6 +39,8 @@ in stdenv.mkDerivation rec {
# don't remove runtime deps # don't remove runtime deps
dontPatchELF = true; dontPatchELF = true;
buildInputs = [ makeWrapper ];
unpackPhase = '' unpackPhase = ''
tar xzf $src tar xzf $src
''; '';
@ -59,6 +61,7 @@ in stdenv.mkDerivation rec {
postFixup = '' postFixup = ''
paxmark m $out/opt/franz/Franz paxmark m $out/opt/franz/Franz
wrapProgram $out/opt/franz/Franz --prefix PATH : ${xdg_utils}/bin
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {

13
pkgs/applications/networking/instant-messengers/rambox/default.nix
View File

@ -1,12 +1,12 @@
{ stdenv, fetchurl, dpkg { stdenv, fetchurl, dpkg, makeWrapper
, xorg, gtk2, atk, glib, pango, gdk_pixbuf, cairo, freetype, fontconfig , xorg, gtk2, atk, glib, pango, gdk_pixbuf, cairo, freetype, fontconfig
, gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify }: , gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify, xdg_utils }:
let let
bits = if stdenv.system == "x86_64-linux" then "x64" bits = if stdenv.system == "x86_64-linux" then "x64"
else "ia32"; else "ia32";
version = "0.5.12"; version = "0.5.13";
runtimeDeps = [ runtimeDeps = [
udev libnotify udev libnotify
@ -23,14 +23,14 @@ in stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "https://github.com/saenzramiro/rambox/releases/download/${version}/Rambox_${version}-${bits}.deb"; url = "https://github.com/saenzramiro/rambox/releases/download/${version}/Rambox_${version}-${bits}.deb";
sha256 = if bits == "x64" then sha256 = if bits == "x64" then
"1jlvpq7wryz4vf6xlsb9c38jrhjiv18rdf2ndlv76png60wl8418" else "0bn562fr1wsnn3xsd4q2rrxi6c56vckrkfmjl2dqb30hpmj2vn0d" else
"063j3gcpp18wdvspy7d43cgv7i5v8c42hn2zpp083jixw9ddsqwa"; "180ndvkil5mk5idwnn7spfygnhhll6pjc342pfzgmzk46a723qs4";
}; };
# don't remove runtime deps # don't remove runtime deps
dontPatchELF = true; dontPatchELF = true;
buildInputs = [ dpkg ]; buildInputs = [ dpkg makeWrapper ];
unpackPhase = "dpkg-deb -x $src ."; unpackPhase = "dpkg-deb -x $src .";
@ -50,6 +50,7 @@ in stdenv.mkDerivation rec {
postFixup = '' postFixup = ''
paxmark m $out/opt/Rambox/rambox paxmark m $out/opt/Rambox/rambox
wrapProgram $out/opt/Rambox/rambox --prefix PATH : ${xdg_utils}/bin
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {