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

Commits on Aug 15, 2018

  1. indicator-application-gtk3: 12.10.0 -> 12.10.1

    @worldofpeace
    worldofpeace committed Aug 15, 2018
    Copy the full SHA
    3a73518 View commit details

Commits on Aug 17, 2018

  1. Merge pull request #45052 from worldofpeace/indicator-application-12.… 

    …10.1

indicator-application-gtk3: 12.10.0 -> 12.10.1
    @jtojnar
    jtojnar authored Aug 17, 2018
    Copy the full SHA
    c40af1f View commit details
Showing with 25 additions and 25 deletions.
  1. +25 −25 pkgs/development/libraries/indicator-application/gtk3.nix
50 changes: 25 additions & 25 deletions pkgs/development/libraries/indicator-application/gtk3.nix
View file
Original file line number Diff line number Diff line change
@@ -1,39 +1,30 @@
{ stdenv, fetchurl, lib, file
, pkgconfig, autoconf
{ stdenv, fetchbzr
, pkgconfig, systemd, autoreconfHook
, glib, dbus-glib, json-glib
, gtk3, libindicator-gtk3, libdbusmenu-gtk3, libappindicator-gtk3 }:

with lib;

stdenv.mkDerivation rec {
name = "indicator-application-gtk3-${version}";
version = "${versionMajor}.${versionMinor}";
versionMajor = "12.10";
versionMinor = "0";

src = fetchurl {
url = "${meta.homepage}/${versionMajor}/${version}/+download/indicator-application-${version}.tar.gz";
sha256 = "1z8ar0k47l4his7zvffbc2kn658nid51svqnfv0dms601w53gbpr";
pname = "indicator-application";
version = "12.10.1";

name = "${pname}-gtk3-${version}";

src = fetchbzr {
url = "https://code.launchpad.net/~indicator-applet-developers/${pname}/trunk.17.04";
rev = "260";
sha256 = "1f0jdyqqb5g86zdpbcyn16x94yjigsfiv2kf73dvni5rp1vafbq1";
};

nativeBuildInputs = [ pkgconfig autoconf ];
nativeBuildInputs = [ pkgconfig autoreconfHook ];

buildInputs = [
glib dbus-glib json-glib
glib dbus-glib json-glib systemd
gtk3 libindicator-gtk3 libdbusmenu-gtk3 libappindicator-gtk3
];

postPatch = ''
substituteInPlace configure.ac \
--replace 'DBUSSERVICEDIR=`$PKG_CONFIG --variable=session_bus_services_dir dbus-1`' \
"DBUSSERVICEDIR=$out/share/dbus-1/services"
autoconf
for f in {configure,ltmain.sh,m4/libtool.m4}; do
substituteInPlace $f \
--replace /usr/bin/file ${file}/bin/file
done
substituteInPlace src/Makefile.in \
--replace 'applicationlibdir = $(INDICATORDIR)' "applicationlibdir = $out/lib"
substituteInPlace data/Makefile.am \
--replace "/etc/xdg/autostart" "$out/etc/xdg/autostart"
'';

configureFlags = [
@@ -47,7 +38,16 @@ stdenv.mkDerivation rec {
"localstatedir=\${TMPDIR}"
];

meta = {
PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "$(out)/lib/systemd/user";
PKG_CONFIG_INDICATOR3_0_4_INDICATORDIR = "$(out)/lib/indicators3/7/";

# Upstart is not used in NixOS
postFixup = ''
rm -rf $out/share/indicator-application/upstart
rm -rf $out/share/upstart
'';

meta = with stdenv.lib; {
description = "Indicator to take menus from applications and place them in the panel";
homepage = https://launchpad.net/indicator-application;
license = licenses.gpl3;