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

Commits on Mar 5, 2018

  1. parole: remove icon cache file from output 

    Adds hicolor-icon-theme as a build input to use its build hook to
clean up icon cache files.
    @rycee
    rycee committed Mar 5, 2018
    Copy the full SHA
    0203ab2 View commit details

  2. xfce4-timer-plugin: remove icon cache file from output 

    Adds hicolor-icon-theme as a build input to use its build hook to
clean up icon cache files.
    @rycee
    rycee committed Mar 5, 2018
    Copy the full SHA
    c7f4020 View commit details
Showing with 5 additions and 4 deletions.
  1. +2 −2 pkgs/desktops/xfce/applications/parole.nix
  2. +3 −2 pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix
4 changes: 2 additions & 2 deletions pkgs/desktops/xfce/applications/parole.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, makeWrapper, pkgconfig, intltool, gst_all_1
, gtk, dbus-glib, libxfce4ui, libxfce4util, xfconf
, taglib, libnotify
, taglib, libnotify, hicolor-icon-theme
, withGstPlugins ? true
}:

@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig intltool ];

buildInputs = [
makeWrapper
makeWrapper hicolor-icon-theme
gtk dbus-glib libxfce4ui libxfce4util xfconf
taglib libnotify
] ++ (with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav]);
5 changes: 3 additions & 2 deletions pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel, libxfce4ui, libxfcegui4, xfconf, gtk}:
{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel
, libxfce4ui, libxfcegui4, xfconf, gtk, hicolor-icon-theme }:

with stdenv.lib;
stdenv.mkDerivation rec {
@@ -13,7 +14,7 @@ stdenv.mkDerivation rec {
name = "${p_name}-${ver_maj}.${ver_min}";

buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf
gtk ];
gtk hicolor-icon-theme ];

nativeBuildInputs = [ pkgconfig ];