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

Commits on Aug 2, 2018

  1. xfce4-13: backport panel plugins from xfce4-12

    volth committed Aug 2, 2018
    Copy the full SHA
    66939ec View commit details

Commits on Aug 3, 2018

  1. Merge pull request #43778 from volth/xfce413-updates 

    xfce4-13: backport panel plugins and icon themes from xfce4-12
    @xeji
    xeji authored Aug 3, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f2f2865 View commit details
4 changes: 2 additions & 2 deletions pkgs/desktops/xfce/art/xfce4-icon-theme.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk }:
{ stdenv, fetchurl, pkgconfig, intltool, gtk2 }:

stdenv.mkDerivation rec {
p_name = "xfce4-icon-theme";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
name = "${p_name}-${ver_maj}.${ver_min}";

nativeBuildInputs = [ pkgconfig ];
buildInputs = [ intltool gtk ];
buildInputs = [ intltool gtk2 ];

meta = {
homepage = http://www.xfce.org/;
4 changes: 2 additions & 2 deletions pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk}:
{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk2 }:

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

nativeBuildInputs = [ pkgconfig ];
buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk ];
buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel xfconf gtk2 ];

meta = {
homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
20 changes: 20 additions & 0 deletions pkgs/desktops/xfce4-13/default.nix
View file
Original file line number Diff line number Diff line change
@@ -92,4 +92,24 @@ makeScope newScope (self: with self; {
xfce4-xkb-plugin = callPackage ./xfce4-xkb-plugin { };

xfwm4 = callPackage ./xfwm4 { };

## COMMON PARTS WITH XFCE 4.12

gtk-xfce-engine = callPackage ../xfce/core/gtk-xfce-engine.nix { withGtk3 = false; };

xfce4-icon-theme = callPackage ../xfce/art/xfce4-icon-theme.nix { };

xfwm4-themes = callPackage ../xfce/art/xfwm4-themes.nix { };

xfce4-embed-plugin = callPackage ../xfce/panel-plugins/xfce4-embed-plugin.nix { };

xfce4-hardware-monitor-plugin = callPackage ../xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix { };

## THIRD PARTY PLIGINS

xfce4-dockbarx-plugin = callPackage ../xfce/panel-plugins/xfce4-dockbarx-plugin.nix { };

xfce4-namebar-plugin = callPackage ../xfce/panel-plugins/xfce4-namebar-plugin.nix { };

xfce4-windowck-plugin = callPackage ../xfce/panel-plugins/xfce4-windowck-plugin.nix { };
})
4 changes: 2 additions & 2 deletions pkgs/desktops/xfce4-13/xfburn/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ mkXfceDerivation, docbook_xsl, exo, gtk2, libburn, libICE, libisofs, libSM, libxfce4ui, libxslt }:
{ mkXfceDerivation, docbook_xsl, exo, gtk2, libburn, libisofs, libxfce4ui, libxslt }:

mkXfceDerivation rec {
category = "apps";
@@ -14,5 +14,5 @@ mkXfceDerivation rec {
sha256 = "1lmv48vqrlap1a2ha72g16vqly18zvcwj8y3f3f00l10pmn52bkp";

nativeBuildInputs = [ libxslt ];
buildInputs = [ exo gtk2 libburn libICE libisofs libSM libxfce4ui ];
buildInputs = [ exo gtk2 libburn libisofs libxfce4ui ];
}
7 changes: 1 addition & 6 deletions pkgs/desktops/xfce4-13/xfce4-mixer/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{ mkXfceDerivation, automakeAddFlags, dbus-glib, gst-plugins-base, gtk2
, libICE, libSM, libunique, libxfce4ui, libxfce4util, xfce4-panel, xfconf }:
{ mkXfceDerivation, automakeAddFlags, dbus-glib, gtk2, libxfce4ui, libxfce4util, xfce4-panel, xfconf }:

mkXfceDerivation rec {
category = "apps";
@@ -17,11 +16,7 @@ mkXfceDerivation rec {

buildInputs = [
dbus-glib
gst-plugins-base
gtk2
libICE
libSM
libunique
libxfce4ui
libxfce4util
xfce4-panel