Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7daa03590d01
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6e90af689733
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Nov 2, 2017

  1. rambox, franz: install xdg_utils for url opening 

    xorg installs this, but wayland doesn't
    gnidorah committed Nov 2, 2017
    Copy the full SHA
    caa8284 View commit details

  2. rambox: 0.5.12 -> 0.5.13

    gnidorah committed Nov 2, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    GPG key ID: E747DF1F9575A3AA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    85f5d5c View commit details

  3. Merge pull request #31095 from gnidorah/rambox 

    rambox: 0.5.12 -> 0.5.13
    @Mic92
    Mic92 authored Nov 2, 2017
    Copy the full SHA
    6e90af6 View commit details
Showing with 12 additions and 8 deletions.
  1. +5 −2 pkgs/applications/networking/instant-messengers/franz/default.nix
  2. +7 −6 pkgs/applications/networking/instant-messengers/rambox/default.nix
7 changes: 5 additions & 2 deletions pkgs/applications/networking/instant-messengers/franz/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, makeDesktopItem
{ stdenv, fetchurl, makeDesktopItem, makeWrapper
, 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
bits = if stdenv.system == "x86_64-linux" then "x64"
@@ -39,6 +39,8 @@ in stdenv.mkDerivation rec {
# don't remove runtime deps
dontPatchELF = true;

buildInputs = [ makeWrapper ];

unpackPhase = ''
tar xzf $src
'';
@@ -59,6 +61,7 @@ in stdenv.mkDerivation rec {

postFixup = ''
paxmark m $out/opt/franz/Franz
wrapProgram $out/opt/franz/Franz --prefix PATH : ${xdg_utils}/bin
'';

meta = with stdenv.lib; {
13 changes: 7 additions & 6 deletions pkgs/applications/networking/instant-messengers/rambox/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, dpkg
{ stdenv, fetchurl, dpkg, makeWrapper
, 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
bits = if stdenv.system == "x86_64-linux" then "x64"
else "ia32";

version = "0.5.12";
version = "0.5.13";

runtimeDeps = [
udev libnotify
@@ -23,14 +23,14 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "https://github.com/saenzramiro/rambox/releases/download/${version}/Rambox_${version}-${bits}.deb";
sha256 = if bits == "x64" then
"1jlvpq7wryz4vf6xlsb9c38jrhjiv18rdf2ndlv76png60wl8418" else
"063j3gcpp18wdvspy7d43cgv7i5v8c42hn2zpp083jixw9ddsqwa";
"0bn562fr1wsnn3xsd4q2rrxi6c56vckrkfmjl2dqb30hpmj2vn0d" else
"180ndvkil5mk5idwnn7spfygnhhll6pjc342pfzgmzk46a723qs4";
};

# don't remove runtime deps
dontPatchELF = true;

buildInputs = [ dpkg ];
buildInputs = [ dpkg makeWrapper ];

unpackPhase = "dpkg-deb -x $src .";

@@ -50,6 +50,7 @@ in stdenv.mkDerivation rec {

postFixup = ''
paxmark m $out/opt/Rambox/rambox
wrapProgram $out/opt/Rambox/rambox --prefix PATH : ${xdg_utils}/bin
'';

meta = with stdenv.lib; {