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: b2405bfcb35b
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ab4991ff5a88
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Jun 11, 2019

  1. cbatticon: 1.6.8 -> 1.6.9

    @romildo
    romildo committed Jun 11, 2019
    Copy the full SHA
    d0c5d91 View commit details

Commits on Jun 15, 2019

  1. Merge pull request #62994 from romildo/upd.cbatticon 

    cbatticon: 1.6.8 -> 1.6.9
    @romildo
    romildo authored Jun 15, 2019
    Copy the full SHA
    ab4991f View commit details
Showing with 10 additions and 11 deletions.
  1. +10 −11 pkgs/applications/misc/cbatticon/default.nix
21 changes: 10 additions & 11 deletions pkgs/applications/misc/cbatticon/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,32 +1,31 @@
{ stdenv, fetchFromGitHub, pkgconfig, gettext, glib, gtk3, libnotify }:

stdenv.mkDerivation rec {

name = "cbatticon-${version}";
version = "1.6.8";
pname = "cbatticon";
version = "1.6.9";

src = fetchFromGitHub {
owner = "valr";
repo = "cbatticon";
repo = pname;
rev = version;
sha256 = "16g26vin1693dbdr9qsnw36fdchx394lp79gvp7gcbw0w1ny9av6";
sha256 = "0kw09d678sd3m18fmi4380sl4a2m5lkfmq0kps16cdmq7z80rvaf";
};

nativeBuildInputs = [ pkgconfig gettext ];

buildInputs = [ glib gtk3 libnotify ];

patchPhase = ''
sed -i -e 's/ -Wno-format//g' Makefile
'';

makeFlags = "PREFIX=$(out)";

nativeBuildInputs = [ pkgconfig gettext ];

buildInputs = [ glib gtk3 libnotify ];
makeFlags = "PREFIX=${placeholder "out"}";

meta = with stdenv.lib; {
description = "Lightweight and fast battery icon that sits in the system tray";
homepage = https://github.com/valr/cbatticon;
license = licenses.gpl2;
maintainers = [ maintainers.domenkozar ];
platforms = platforms.linux;
maintainers = [ maintainers.domenkozar ];
};
}