Merge pull request #72800 from worldofpeace/xfce-4.12-drop
Drop Xfce 4.12 and promote Xfce module and packageset to 4.14
This commit is contained in:
worldofpeace
GitHub
commit
a80f1c4151
@ -148,6 +148,14 @@
|
|||||||
You should now use the different build tools coming with the languages with sandbox mode disabled.
|
You should now use the different build tools coming with the languages with sandbox mode disabled.
|
||||||
</para>
|
</para>
|
||||||
</listitem>
|
</listitem>
|
||||||
|
<listitem>
|
||||||
|
<para>
|
||||||
|
There is now only one Xfce package-set and module. This means attributes, <literal>xfce4-14</literal>
|
||||||
|
<literal>xfce4-12</literal>, and <literal>xfceUnstable</literal> all now point to the latest Xfce 4.14
|
||||||
|
packages. And in future NixOS releases will be the latest released version of Xfce available at the
|
||||||
|
time during the releases development (if viable).
|
||||||
|
</para>
|
||||||
|
</listitem>
|
||||||
</itemizedlist>
|
</itemizedlist>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
|
|||||||
@ -7,12 +7,17 @@ with lib;
|
|||||||
let
|
let
|
||||||
|
|
||||||
cfg = config.services.tumbler;
|
cfg = config.services.tumbler;
|
||||||
tumbler = cfg.package;
|
|
||||||
|
|
||||||
in
|
in
|
||||||
|
|
||||||
{
|
{
|
||||||
|
|
||||||
|
imports = [
|
||||||
|
(mkRemovedOptionModule
|
||||||
|
[ "services" "tumbler" "package" ]
|
||||||
|
"")
|
||||||
|
];
|
||||||
|
|
||||||
###### interface
|
###### interface
|
||||||
|
|
||||||
options = {
|
options = {
|
||||||
@ -21,13 +26,6 @@ in
|
|||||||
|
|
||||||
enable = mkEnableOption "Tumbler, A D-Bus thumbnailer service";
|
enable = mkEnableOption "Tumbler, A D-Bus thumbnailer service";
|
||||||
|
|
||||||
package = mkOption {
|
|
||||||
type = types.package;
|
|
||||||
default = pkgs.xfce4-14.tumbler;
|
|
||||||
description = "Which tumbler package to use";
|
|
||||||
example = pkgs.xfce4-12.tumbler;
|
|
||||||
};
|
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
@ -37,11 +35,11 @@ in
|
|||||||
|
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
|
|
||||||
environment.systemPackages = [
|
environment.systemPackages = with pkgs.xfce; [
|
||||||
tumbler
|
tumbler
|
||||||
];
|
];
|
||||||
|
|
||||||
services.dbus.packages = [
|
services.dbus.packages = with pkgs.xfce; [
|
||||||
tumbler
|
tumbler
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|||||||
@ -18,7 +18,7 @@ in
|
|||||||
# determines the default: later modules (if enabled) are preferred.
|
# determines the default: later modules (if enabled) are preferred.
|
||||||
# E.g., if Plasma 5 is enabled, it supersedes xterm.
|
# E.g., if Plasma 5 is enabled, it supersedes xterm.
|
||||||
imports = [
|
imports = [
|
||||||
./none.nix ./xterm.nix ./xfce.nix ./xfce4-14.nix ./plasma5.nix ./lumina.nix
|
./none.nix ./xterm.nix ./xfce.nix ./plasma5.nix ./lumina.nix
|
||||||
./lxqt.nix ./enlightenment.nix ./gnome3.nix ./kodi.nix ./maxx.nix
|
./lxqt.nix ./enlightenment.nix ./gnome3.nix ./kodi.nix ./maxx.nix
|
||||||
./mate.nix ./pantheon.nix ./surf-display.nix
|
./mate.nix ./pantheon.nix ./surf-display.nix
|
||||||
];
|
];
|
||||||
|
|||||||
@ -7,6 +7,32 @@ let
|
|||||||
in
|
in
|
||||||
|
|
||||||
{
|
{
|
||||||
|
|
||||||
|
imports = [
|
||||||
|
# added 2019-08-18
|
||||||
|
# needed to preserve some semblance of UI familarity
|
||||||
|
# with original XFCE module
|
||||||
|
(mkRenamedOptionModule
|
||||||
|
[ "services" "xserver" "desktopManager" "xfce4-14" "extraSessionCommands" ]
|
||||||
|
[ "services" "xserver" "displayManager" "sessionCommands" ])
|
||||||
|
|
||||||
|
# added 2019-11-04
|
||||||
|
# xfce4-14 module removed and promoted to xfce.
|
||||||
|
# Needed for configs that used xfce4-14 module to migrate to this one.
|
||||||
|
(mkRenamedOptionModule
|
||||||
|
[ "services" "xserver" "desktopManager" "xfce4-14" "enable" ]
|
||||||
|
[ "services" "xserver" "desktopManager" "xfce" "enable" ])
|
||||||
|
(mkRenamedOptionModule
|
||||||
|
[ "services" "xserver" "desktopManager" "xfce4-14" "noDesktop" ]
|
||||||
|
[ "services" "xserver" "desktopManager" "xfce" "noDesktop" ])
|
||||||
|
(mkRenamedOptionModule
|
||||||
|
[ "services" "xserver" "desktopManager" "xfce4-14" "enableXfwm" ]
|
||||||
|
[ "services" "xserver" "desktopManager" "xfce" "enableXfwm" ])
|
||||||
|
(mkRenamedOptionModule
|
||||||
|
[ "services" "xserver" "desktopManager" "xfce" "extraSessionCommands" ]
|
||||||
|
[ "services" "xserver" "displayManager" "sessionCommands" ])
|
||||||
|
];
|
||||||
|
|
||||||
options = {
|
options = {
|
||||||
services.xserver.desktopManager.xfce = {
|
services.xserver.desktopManager.xfce = {
|
||||||
enable = mkOption {
|
enable = mkOption {
|
||||||
@ -30,14 +56,6 @@ in
|
|||||||
description = "Don't install XFCE desktop components (xfdesktop, panel and notification daemon).";
|
description = "Don't install XFCE desktop components (xfdesktop, panel and notification daemon).";
|
||||||
};
|
};
|
||||||
|
|
||||||
extraSessionCommands = mkOption {
|
|
||||||
default = "";
|
|
||||||
type = types.lines;
|
|
||||||
description = ''
|
|
||||||
Shell commands executed just before XFCE is started.
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
enableXfwm = mkOption {
|
enableXfwm = mkOption {
|
||||||
type = types.bool;
|
type = types.bool;
|
||||||
default = true;
|
default = true;
|
||||||
@ -48,76 +66,101 @@ in
|
|||||||
|
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
environment.systemPackages = with pkgs.xfce // pkgs; [
|
environment.systemPackages = with pkgs.xfce // pkgs; [
|
||||||
# Get GTK themes and gtk-update-icon-cache
|
glib # for gsettings
|
||||||
gtk2.out
|
gtk3.out # gtk-update-icon-cache
|
||||||
|
|
||||||
# Supplies some abstract icons such as:
|
gnome3.gnome-themes-extra
|
||||||
# utilities-terminal, accessories-text-editor
|
|
||||||
gnome3.adwaita-icon-theme
|
gnome3.adwaita-icon-theme
|
||||||
|
|
||||||
hicolor-icon-theme
|
hicolor-icon-theme
|
||||||
tango-icon-theme
|
tango-icon-theme
|
||||||
xfce4-icon-theme
|
xfce4-icon-theme
|
||||||
|
|
||||||
|
desktop-file-utils
|
||||||
|
shared-mime-info # for update-mime-database
|
||||||
|
|
||||||
|
# For a polkit authentication agent
|
||||||
|
polkit_gnome
|
||||||
|
|
||||||
# Needed by Xfce's xinitrc script
|
# Needed by Xfce's xinitrc script
|
||||||
# TODO: replace with command -v
|
xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/
|
||||||
which
|
|
||||||
|
|
||||||
exo
|
exo
|
||||||
garcon
|
garcon
|
||||||
gtk-xfce-engine
|
|
||||||
libxfce4ui
|
libxfce4ui
|
||||||
tumbler
|
|
||||||
xfconf
|
xfconf
|
||||||
|
|
||||||
mousepad
|
mousepad
|
||||||
|
parole
|
||||||
ristretto
|
ristretto
|
||||||
xfce4-appfinder
|
xfce4-appfinder
|
||||||
xfce4-screenshooter
|
xfce4-screenshooter
|
||||||
xfce4-session
|
xfce4-session
|
||||||
xfce4-settings
|
xfce4-settings
|
||||||
|
xfce4-taskmanager
|
||||||
xfce4-terminal
|
xfce4-terminal
|
||||||
|
|
||||||
(thunar.override { thunarPlugins = cfg.thunarPlugins; })
|
(thunar.override { thunarPlugins = cfg.thunarPlugins; })
|
||||||
thunar-volman # TODO: drop
|
] # TODO: NetworkManager doesn't belong here
|
||||||
] ++ (if config.hardware.pulseaudio.enable
|
++ optional config.networking.networkmanager.enable networkmanagerapplet
|
||||||
then [ xfce4-mixer-pulse xfce4-volumed-pulse ]
|
++ optional config.powerManagement.enable xfce4-power-manager
|
||||||
else [ xfce4-mixer xfce4-volumed ])
|
++ optionals config.hardware.pulseaudio.enable [
|
||||||
# TODO: NetworkManager doesn't belong here
|
pavucontrol
|
||||||
++ optionals config.networking.networkmanager.enable [ networkmanagerapplet ]
|
# volume up/down keys support:
|
||||||
++ optionals config.powerManagement.enable [ xfce4-power-manager ]
|
# xfce4-pulseaudio-plugin includes all the functionalities of xfce4-volumed-pulse
|
||||||
++ optionals cfg.enableXfwm [ xfwm4 ]
|
# but can only be used with xfce4-panel, so for no-desktop usage we still include
|
||||||
++ optionals (!cfg.noDesktop) [
|
# xfce4-volumed-pulse
|
||||||
xfce4-panel
|
(if cfg.noDesktop then xfce4-volumed-pulse else xfce4-pulseaudio-plugin)
|
||||||
|
] ++ optionals cfg.enableXfwm [
|
||||||
|
xfwm4
|
||||||
|
xfwm4-themes
|
||||||
|
] ++ optionals (!cfg.noDesktop) [
|
||||||
xfce4-notifyd
|
xfce4-notifyd
|
||||||
|
xfce4-panel
|
||||||
xfdesktop
|
xfdesktop
|
||||||
];
|
];
|
||||||
|
|
||||||
environment.pathsToLink = [
|
environment.pathsToLink = [
|
||||||
"/share/xfce4"
|
"/share/xfce4"
|
||||||
"/share/themes"
|
"/lib/xfce4"
|
||||||
"/share/gtksourceview-2.0"
|
"/share/gtksourceview-3.0"
|
||||||
|
"/share/gtksourceview-4.0"
|
||||||
];
|
];
|
||||||
|
|
||||||
services.xserver.gdk-pixbuf.modulePackages = [ pkgs.librsvg ];
|
|
||||||
|
|
||||||
services.xserver.desktopManager.session = [{
|
services.xserver.desktopManager.session = [{
|
||||||
name = "xfce";
|
name = "xfce";
|
||||||
bgSupport = true;
|
bgSupport = true;
|
||||||
start = ''
|
start = ''
|
||||||
${cfg.extraSessionCommands}
|
${pkgs.runtimeShell} ${pkgs.xfce.xfce4-session.xinitrc} &
|
||||||
|
|
||||||
${pkgs.runtimeShell} ${pkgs.xfce.xinitrc} &
|
|
||||||
waitPID=$!
|
waitPID=$!
|
||||||
'';
|
'';
|
||||||
}];
|
}];
|
||||||
|
|
||||||
services.xserver.updateDbusEnvironment = true;
|
services.xserver.updateDbusEnvironment = true;
|
||||||
|
services.xserver.gdk-pixbuf.modulePackages = [ pkgs.librsvg ];
|
||||||
|
|
||||||
# Enable helpful DBus services.
|
# Enable helpful DBus services.
|
||||||
services.udisks2.enable = true;
|
services.udisks2.enable = true;
|
||||||
|
security.polkit.enable = true;
|
||||||
|
services.accounts-daemon.enable = true;
|
||||||
services.upower.enable = config.powerManagement.enable;
|
services.upower.enable = config.powerManagement.enable;
|
||||||
|
services.gnome3.glib-networking.enable = true;
|
||||||
services.gvfs.enable = true;
|
services.gvfs.enable = true;
|
||||||
services.gvfs.package = pkgs.xfce.gvfs;
|
services.gvfs.package = pkgs.xfce.gvfs;
|
||||||
|
services.tumbler.enable = true;
|
||||||
|
services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true));
|
||||||
|
services.xserver.libinput.enable = mkDefault true; # used in xfce4-settings-manager
|
||||||
|
|
||||||
|
# Enable default programs
|
||||||
|
programs.dconf.enable = true;
|
||||||
|
|
||||||
|
# Shell integration for VTE terminals
|
||||||
|
programs.bash.vteIntegration = mkDefault true;
|
||||||
|
programs.zsh.vteIntegration = mkDefault true;
|
||||||
|
|
||||||
|
# Systemd services
|
||||||
|
systemd.packages = with pkgs.xfce; [
|
||||||
|
(thunar.override { thunarPlugins = cfg.thunarPlugins; })
|
||||||
|
] ++ optional (!cfg.noDesktop) xfce4-notifyd;
|
||||||
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,152 +0,0 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
|
||||||
|
|
||||||
with lib;
|
|
||||||
|
|
||||||
let
|
|
||||||
cfg = config.services.xserver.desktopManager.xfce4-14;
|
|
||||||
in
|
|
||||||
|
|
||||||
{
|
|
||||||
# added 2019-08-18
|
|
||||||
# needed to preserve some semblance of UI familarity
|
|
||||||
# with original XFCE module
|
|
||||||
imports = [
|
|
||||||
(mkRenamedOptionModule
|
|
||||||
[ "services" "xserver" "desktopManager" "xfce4-14" "extraSessionCommands" ]
|
|
||||||
[ "services" "xserver" "displayManager" "sessionCommands" ])
|
|
||||||
];
|
|
||||||
|
|
||||||
options = {
|
|
||||||
services.xserver.desktopManager.xfce4-14 = {
|
|
||||||
enable = mkOption {
|
|
||||||
type = types.bool;
|
|
||||||
default = false;
|
|
||||||
description = "Enable the Xfce desktop environment.";
|
|
||||||
};
|
|
||||||
|
|
||||||
# TODO: support thunar plugins
|
|
||||||
# thunarPlugins = mkOption {
|
|
||||||
# default = [];
|
|
||||||
# type = types.listOf types.package;
|
|
||||||
# example = literalExample "[ pkgs.xfce4-14.thunar-archive-plugin ]";
|
|
||||||
# description = ''
|
|
||||||
# A list of plugin that should be installed with Thunar.
|
|
||||||
# '';
|
|
||||||
# };
|
|
||||||
|
|
||||||
noDesktop = mkOption {
|
|
||||||
type = types.bool;
|
|
||||||
default = false;
|
|
||||||
description = "Don't install XFCE desktop components (xfdesktop, panel and notification daemon).";
|
|
||||||
};
|
|
||||||
|
|
||||||
enableXfwm = mkOption {
|
|
||||||
type = types.bool;
|
|
||||||
default = true;
|
|
||||||
description = "Enable the XFWM (default) window manager.";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
|
||||||
environment.systemPackages = with pkgs.xfce4-14 // pkgs; [
|
|
||||||
glib # for gsettings
|
|
||||||
gtk3.out # gtk-update-icon-cache
|
|
||||||
|
|
||||||
gnome3.gnome-themes-extra
|
|
||||||
gnome3.adwaita-icon-theme
|
|
||||||
hicolor-icon-theme
|
|
||||||
tango-icon-theme
|
|
||||||
xfce4-icon-theme
|
|
||||||
|
|
||||||
desktop-file-utils
|
|
||||||
shared-mime-info # for update-mime-database
|
|
||||||
|
|
||||||
# For a polkit authentication agent
|
|
||||||
polkit_gnome
|
|
||||||
|
|
||||||
# Needed by Xfce's xinitrc script
|
|
||||||
xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/
|
|
||||||
|
|
||||||
exo
|
|
||||||
garcon
|
|
||||||
libxfce4ui
|
|
||||||
xfconf
|
|
||||||
|
|
||||||
mousepad
|
|
||||||
parole
|
|
||||||
ristretto
|
|
||||||
xfce4-appfinder
|
|
||||||
xfce4-screenshooter
|
|
||||||
xfce4-session
|
|
||||||
xfce4-settings
|
|
||||||
xfce4-taskmanager
|
|
||||||
xfce4-terminal
|
|
||||||
|
|
||||||
# TODO: resync patch for plugins
|
|
||||||
#(thunar.override { thunarPlugins = cfg.thunarPlugins; })
|
|
||||||
thunar
|
|
||||||
] # TODO: NetworkManager doesn't belong here
|
|
||||||
++ optional config.networking.networkmanager.enable networkmanagerapplet
|
|
||||||
++ optional config.powerManagement.enable xfce4-power-manager
|
|
||||||
++ optionals config.hardware.pulseaudio.enable [
|
|
||||||
pavucontrol
|
|
||||||
# volume up/down keys support:
|
|
||||||
# xfce4-pulseaudio-plugin includes all the functionalities of xfce4-volumed-pulse
|
|
||||||
# but can only be used with xfce4-panel, so for no-desktop usage we still include
|
|
||||||
# xfce4-volumed-pulse
|
|
||||||
(if cfg.noDesktop then xfce4-volumed-pulse else xfce4-pulseaudio-plugin)
|
|
||||||
] ++ optionals cfg.enableXfwm [
|
|
||||||
xfwm4
|
|
||||||
xfwm4-themes
|
|
||||||
] ++ optionals (!cfg.noDesktop) [
|
|
||||||
xfce4-notifyd
|
|
||||||
xfce4-panel
|
|
||||||
xfdesktop
|
|
||||||
];
|
|
||||||
|
|
||||||
environment.pathsToLink = [
|
|
||||||
"/share/xfce4"
|
|
||||||
"/lib/xfce4"
|
|
||||||
"/share/gtksourceview-3.0"
|
|
||||||
"/share/gtksourceview-4.0"
|
|
||||||
];
|
|
||||||
|
|
||||||
services.xserver.desktopManager.session = [{
|
|
||||||
name = "xfce4-14";
|
|
||||||
bgSupport = true;
|
|
||||||
start = ''
|
|
||||||
${pkgs.runtimeShell} ${pkgs.xfce4-14.xinitrc} &
|
|
||||||
waitPID=$!
|
|
||||||
'';
|
|
||||||
}];
|
|
||||||
|
|
||||||
services.xserver.updateDbusEnvironment = true;
|
|
||||||
services.xserver.gdk-pixbuf.modulePackages = [ pkgs.librsvg ];
|
|
||||||
|
|
||||||
# Enable helpful DBus services.
|
|
||||||
services.udisks2.enable = true;
|
|
||||||
security.polkit.enable = true;
|
|
||||||
services.accounts-daemon.enable = true;
|
|
||||||
services.upower.enable = config.powerManagement.enable;
|
|
||||||
services.gnome3.glib-networking.enable = true;
|
|
||||||
services.gvfs.enable = true;
|
|
||||||
services.gvfs.package = pkgs.xfce.gvfs;
|
|
||||||
services.tumbler.enable = true;
|
|
||||||
services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true));
|
|
||||||
services.xserver.libinput.enable = mkDefault true; # used in xfce4-settings-manager
|
|
||||||
|
|
||||||
# Enable default programs
|
|
||||||
programs.dconf.enable = true;
|
|
||||||
|
|
||||||
# Shell integration for VTE terminals
|
|
||||||
programs.bash.vteIntegration = mkDefault true;
|
|
||||||
programs.zsh.vteIntegration = mkDefault true;
|
|
||||||
|
|
||||||
# Systemd services
|
|
||||||
systemd.packages = with pkgs.xfce4-14; [
|
|
||||||
thunar
|
|
||||||
] ++ optional (!cfg.noDesktop) xfce4-notifyd;
|
|
||||||
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@ -136,7 +136,6 @@ in rec {
|
|||||||
(all nixos.tests.switchTest)
|
(all nixos.tests.switchTest)
|
||||||
(all nixos.tests.udisks2)
|
(all nixos.tests.udisks2)
|
||||||
(all nixos.tests.xfce)
|
(all nixos.tests.xfce)
|
||||||
(all nixos.tests.xfce4-14)
|
|
||||||
|
|
||||||
nixpkgs.tarball
|
nixpkgs.tarball
|
||||||
(all allSupportedNixpkgs.emacs)
|
(all allSupportedNixpkgs.emacs)
|
||||||
|
|||||||
@ -284,7 +284,6 @@ in
|
|||||||
wordpress = handleTest ./wordpress.nix {};
|
wordpress = handleTest ./wordpress.nix {};
|
||||||
xautolock = handleTest ./xautolock.nix {};
|
xautolock = handleTest ./xautolock.nix {};
|
||||||
xfce = handleTest ./xfce.nix {};
|
xfce = handleTest ./xfce.nix {};
|
||||||
xfce4-14 = handleTest ./xfce4-14.nix {};
|
|
||||||
xmonad = handleTest ./xmonad.nix {};
|
xmonad = handleTest ./xmonad.nix {};
|
||||||
xrdp = handleTest ./xrdp.nix {};
|
xrdp = handleTest ./xrdp.nix {};
|
||||||
xss-lock = handleTest ./xss-lock.nix {};
|
xss-lock = handleTest ./xss-lock.nix {};
|
||||||
|
|||||||
@ -1,8 +1,5 @@
|
|||||||
import ./make-test.nix ({ pkgs, ...} : {
|
import ./make-test.nix ({ pkgs, ...} : {
|
||||||
name = "xfce";
|
name = "xfce";
|
||||||
meta = with pkgs.stdenv.lib.maintainers; {
|
|
||||||
maintainers = [ eelco shlevy ];
|
|
||||||
};
|
|
||||||
|
|
||||||
machine =
|
machine =
|
||||||
{ pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
@ -16,8 +13,6 @@ import ./make-test.nix ({ pkgs, ...} : {
|
|||||||
|
|
||||||
services.xserver.desktopManager.xfce.enable = true;
|
services.xserver.desktopManager.xfce.enable = true;
|
||||||
|
|
||||||
environment.systemPackages = [ pkgs.xorg.xmessage ];
|
|
||||||
|
|
||||||
hardware.pulseaudio.enable = true; # needed for the factl test, /dev/snd/* exists without them but udev doesn't care then
|
hardware.pulseaudio.enable = true; # needed for the factl test, /dev/snd/* exists without them but udev doesn't care then
|
||||||
|
|
||||||
virtualisation.memorySize = 1024;
|
virtualisation.memorySize = 1024;
|
||||||
@ -38,9 +33,5 @@ import ./make-test.nix ({ pkgs, ...} : {
|
|||||||
$machine->waitForWindow(qr/Terminal/);
|
$machine->waitForWindow(qr/Terminal/);
|
||||||
$machine->sleep(10);
|
$machine->sleep(10);
|
||||||
$machine->screenshot("screen");
|
$machine->screenshot("screen");
|
||||||
|
|
||||||
# Ensure that the X server does proper access control.
|
|
||||||
$machine->mustFail("su - bob -c 'DISPLAY=:0.0 xmessage Foo'");
|
|
||||||
$machine->mustFail("su - bob -c 'DISPLAY=:0 xmessage Foo'");
|
|
||||||
'';
|
'';
|
||||||
})
|
})
|
||||||
|
|||||||
@ -1,37 +0,0 @@
|
|||||||
import ./make-test.nix ({ pkgs, ...} : {
|
|
||||||
name = "xfce4-14";
|
|
||||||
|
|
||||||
machine =
|
|
||||||
{ pkgs, ... }:
|
|
||||||
|
|
||||||
{ imports = [ ./common/user-account.nix ];
|
|
||||||
|
|
||||||
services.xserver.enable = true;
|
|
||||||
|
|
||||||
services.xserver.displayManager.auto.enable = true;
|
|
||||||
services.xserver.displayManager.auto.user = "alice";
|
|
||||||
|
|
||||||
services.xserver.desktopManager.xfce4-14.enable = true;
|
|
||||||
|
|
||||||
hardware.pulseaudio.enable = true; # needed for the factl test, /dev/snd/* exists without them but udev doesn't care then
|
|
||||||
|
|
||||||
virtualisation.memorySize = 1024;
|
|
||||||
};
|
|
||||||
|
|
||||||
testScript =
|
|
||||||
''
|
|
||||||
$machine->waitForX;
|
|
||||||
$machine->waitForFile("/home/alice/.Xauthority");
|
|
||||||
$machine->succeed("xauth merge ~alice/.Xauthority");
|
|
||||||
$machine->waitForWindow(qr/xfce4-panel/);
|
|
||||||
$machine->sleep(10);
|
|
||||||
|
|
||||||
# Check that logging in has given the user ownership of devices.
|
|
||||||
$machine->succeed("getfacl -p /dev/snd/timer | grep -q alice");
|
|
||||||
|
|
||||||
$machine->succeed("su - alice -c 'DISPLAY=:0.0 xfce4-terminal &'");
|
|
||||||
$machine->waitForWindow(qr/Terminal/);
|
|
||||||
$machine->sleep(10);
|
|
||||||
$machine->screenshot("screen");
|
|
||||||
'';
|
|
||||||
})
|
|
||||||
@ -1,22 +0,0 @@
|
|||||||
{ stdenv, fetchurl, python, gettext, intltool, pkgconfig, gtk, gvfs }:
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
p_name = "gigolo";
|
|
||||||
ver_maj = "0.4";
|
|
||||||
ver_min = "2";
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2";
|
|
||||||
sha256 = "0r4ij0mlnp0bqq44pyrdcpz18r1zwsksw6w5yc0jzgg7wj7wfgsm";
|
|
||||||
};
|
|
||||||
name = "${p_name}-${ver_maj}.${ver_min}";
|
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig ];
|
|
||||||
buildInputs = [ python gettext intltool gtk gvfs];
|
|
||||||
|
|
||||||
meta = {
|
|
||||||
homepage = "https://goodies.xfce.org/projects/applications/${p_name}";
|
|
||||||
description = "A frontend to easily manage connections to remote filesystems";
|
|
||||||
platforms = stdenv.lib.platforms.linux;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@ -9,4 +9,8 @@ mkXfceDerivation {
|
|||||||
|
|
||||||
nativeBuildInputs = [ exo ];
|
nativeBuildInputs = [ exo ];
|
||||||
buildInputs = [ gtk3 glib gvfs ];
|
buildInputs = [ gtk3 glib gvfs ];
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "A frontend to easily manage connections to remote filesystems";
|
||||||
|
};
|
||||||
}
|
}
|
||||||
@ -1,90 +0,0 @@
|
|||||||
diff -urNZ a/mousepad/mousepad-action-group.c b/mousepad/mousepad-action-group.c
|
|
||||||
--- a/mousepad/mousepad-action-group.c 2014-09-01 20:50:07.000000000 +0000
|
|
||||||
+++ b/mousepad/mousepad-action-group.c 2017-12-18 16:57:46.836538403 +0000
|
|
||||||
@@ -302,11 +302,6 @@
|
|
||||||
gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), TRUE);
|
|
||||||
self->locked = FALSE;
|
|
||||||
|
|
||||||
- /* update the setting when the active action is changed */
|
|
||||||
- self->locked = TRUE;
|
|
||||||
- MOUSEPAD_SETTING_SET_STRING (COLOR_SCHEME, gtk_source_style_scheme_get_id (scheme));
|
|
||||||
- self->locked = FALSE;
|
|
||||||
-
|
|
||||||
g_object_notify (G_OBJECT (self), "active-style-scheme");
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -473,6 +468,8 @@
|
|
||||||
mousepad_action_group_style_scheme_action_activate (MousepadActionGroup *self,
|
|
||||||
MousepadStyleSchemeAction *action)
|
|
||||||
{
|
|
||||||
+ const gchar *scheme_name = NULL;
|
|
||||||
+
|
|
||||||
/* only update the active action if we're not already in the process of
|
|
||||||
* setting it and the sender action is actually active */
|
|
||||||
if (! self->locked &&
|
|
||||||
@@ -481,7 +478,14 @@
|
|
||||||
GtkSourceStyleScheme *scheme;
|
|
||||||
|
|
||||||
scheme = mousepad_style_scheme_action_get_style_scheme (action);
|
|
||||||
- mousepad_action_group_set_active_style_scheme (self, scheme);
|
|
||||||
+
|
|
||||||
+ /* update the setting when the active action is changed */
|
|
||||||
+ if (scheme != NULL)
|
|
||||||
+ scheme_name = gtk_source_style_scheme_get_id(scheme);
|
|
||||||
+
|
|
||||||
+ self->locked = TRUE;
|
|
||||||
+ MOUSEPAD_SETTING_SET_STRING (COLOR_SCHEME, scheme_name);
|
|
||||||
+ self->locked = FALSE;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
diff -urNZ a/mousepad/mousepad-window.c b/mousepad/mousepad-window.c
|
|
||||||
--- a/mousepad/mousepad-window.c 2014-09-01 20:58:02.000000000 +0000
|
|
||||||
+++ b/mousepad/mousepad-window.c 2017-12-18 17:07:51.099321408 +0000
|
|
||||||
@@ -712,32 +712,6 @@
|
|
||||||
|
|
||||||
|
|
||||||
static void
|
|
||||||
-mousepad_window_action_group_style_scheme_changed (MousepadWindow *window,
|
|
||||||
- GParamSpec *pspec,
|
|
||||||
- MousepadActionGroup *group)
|
|
||||||
-{
|
|
||||||
- GtkSourceStyleScheme *scheme;
|
|
||||||
- const gchar *scheme_id;
|
|
||||||
- gint npages, i;
|
|
||||||
-
|
|
||||||
- /* get the new active language */
|
|
||||||
- scheme = mousepad_action_group_get_active_style_scheme (group);
|
|
||||||
- scheme_id = gtk_source_style_scheme_get_id (scheme);
|
|
||||||
-
|
|
||||||
- /* update the color scheme on all the documents */
|
|
||||||
- npages = gtk_notebook_get_n_pages (GTK_NOTEBOOK (window->notebook));
|
|
||||||
- for (i = 0; i < npages; i++)
|
|
||||||
- {
|
|
||||||
- MousepadDocument *document;
|
|
||||||
-
|
|
||||||
- document = MOUSEPAD_DOCUMENT (gtk_notebook_get_nth_page (GTK_NOTEBOOK (window->notebook), i));
|
|
||||||
- mousepad_view_set_color_scheme (document->textview, scheme_id);
|
|
||||||
- }
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
-
|
|
||||||
-
|
|
||||||
-static void
|
|
||||||
mousepad_window_create_style_schemes_menu (MousepadWindow *window)
|
|
||||||
{
|
|
||||||
GtkWidget *menu, *item;
|
|
||||||
@@ -751,13 +725,6 @@
|
|
||||||
gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), menu);
|
|
||||||
gtk_widget_show_all (menu);
|
|
||||||
gtk_widget_show (item);
|
|
||||||
-
|
|
||||||
- /* watch for activations of the style schemes actions */
|
|
||||||
- g_signal_connect_object (window->action_group,
|
|
||||||
- "notify::active-style-scheme",
|
|
||||||
- G_CALLBACK (mousepad_window_action_group_style_scheme_changed),
|
|
||||||
- window,
|
|
||||||
- G_CONNECT_SWAPPED);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@ -1,38 +0,0 @@
|
|||||||
{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util
|
|
||||||
, gtk, gtksourceview, dbus, dbus-glib, makeWrapper
|
|
||||||
, dconf }:
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
p_name = "mousepad";
|
|
||||||
ver_maj = "0.4";
|
|
||||||
ver_min = "0";
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2";
|
|
||||||
sha256 = "60114431eac8db6bb6ce18bd38f1630cccb684375b97a445a1b6fd619848d132";
|
|
||||||
};
|
|
||||||
name = "${p_name}-${ver_maj}.${ver_min}";
|
|
||||||
|
|
||||||
patches = [ ./mousepad-12134.patch ];
|
|
||||||
|
|
||||||
buildInputs =
|
|
||||||
[ pkgconfig intltool libxfce4util
|
|
||||||
gtk gtksourceview dbus dbus-glib makeWrapper
|
|
||||||
dconf
|
|
||||||
];
|
|
||||||
|
|
||||||
configureFlags = [ "--enable-keyfile-settings" ];
|
|
||||||
|
|
||||||
preFixup = ''
|
|
||||||
wrapProgram "$out/bin/mousepad" \
|
|
||||||
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:${gtksourceview}/share" \
|
|
||||||
--prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules"
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = {
|
|
||||||
homepage = https://www.xfce.org/;
|
|
||||||
description = "A simple text editor for Xfce";
|
|
||||||
license = stdenv.lib.licenses.gpl2Plus;
|
|
||||||
platforms = stdenv.lib.platforms.linux;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@ -12,4 +12,8 @@ mkXfceDerivation {
|
|||||||
|
|
||||||
# See https://github.com/NixOS/nixpkgs/issues/36468
|
# See https://github.com/NixOS/nixpkgs/issues/36468
|
||||||
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
|
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "A simple text editor for Xfce";
|
||||||
|
};
|
||||||
}
|
}
|
||||||
@ -1,44 +0,0 @@
|
|||||||
{ stdenv, fetchurl, fetchpatch, pkgconfig, bison, flex, intltool, gtk, libical, dbus-glib, tzdata
|
|
||||||
, libnotify, popt, xfce }:
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
name = "${p_name}-${ver_maj}.${ver_min}";
|
|
||||||
p_name = "orage";
|
|
||||||
ver_maj = "4.12";
|
|
||||||
ver_min = "1";
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2";
|
|
||||||
sha256 = "0qlhvnl2m33vfxqlbkic2nmfpwyd4mq230jzhs48cg78392amy9w";
|
|
||||||
};
|
|
||||||
|
|
||||||
patches = [
|
|
||||||
# Fix build with libical 3.0
|
|
||||||
(fetchpatch {
|
|
||||||
name = "fix-libical3.patch";
|
|
||||||
url = https://git.archlinux.org/svntogit/packages.git/plain/trunk/libical3.patch?h=packages/orage&id=7b1b06c42dda034d538977b9f3550b28e370057f;
|
|
||||||
sha256 = "1l8s106mcidmbx2p8c2pi8v9ngbv2x3fsgv36j8qk8wyd4qd1jbf";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
postPatch = ''
|
|
||||||
substituteInPlace src/parameters.c --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
|
|
||||||
substituteInPlace src/tz_zoneinfo_read.c --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
|
|
||||||
substituteInPlace tz_convert/tz_convert.c --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
|
|
||||||
'';
|
|
||||||
|
|
||||||
postConfigure = "rm -rf libical"; # ensure pkgs.libical is used instead of one included in the orage sources
|
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig intltool bison flex ];
|
|
||||||
|
|
||||||
buildInputs = [ gtk libical dbus-glib libnotify popt xfce.libxfce4util
|
|
||||||
xfce.xfce4-panel ];
|
|
||||||
|
|
||||||
meta = {
|
|
||||||
homepage = https://www.xfce.org/projects/;
|
|
||||||
description = "A simple calendar application with reminders";
|
|
||||||
license = stdenv.lib.licenses.gpl2;
|
|
||||||
platforms = stdenv.lib.platforms.linux;
|
|
||||||
maintainers = [ stdenv.lib.maintainers.romildo ];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@ -32,4 +32,8 @@ mkXfceDerivation {
|
|||||||
sha256 = "1l8s106mcidmbx2p8c2pi8v9ngbv2x3fsgv36j8qk8wyd4qd1jbf";
|
sha256 = "1l8s106mcidmbx2p8c2pi8v9ngbv2x3fsgv36j8qk8wyd4qd1jbf";
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "A simple calendar application with reminders";
|
||||||
|
};
|
||||||
}
|
}
|
||||||
@ -1,38 +0,0 @@
|
|||||||
{ stdenv, fetchurl, makeWrapper, pkgconfig, intltool, gst_all_1
|
|
||||||
, gtk, dbus-glib, libxfce4ui, libxfce4util, xfconf
|
|
||||||
, taglib, libnotify, hicolor-icon-theme
|
|
||||||
, withGstPlugins ? true
|
|
||||||
}:
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
p_name = "parole";
|
|
||||||
ver_maj = "0.5";
|
|
||||||
ver_min = "4";
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2";
|
|
||||||
sha256 = "1hxzqg9dfghrhvmnnccwwa4278fh2awkcqy89sla05m08mxvvx60";
|
|
||||||
};
|
|
||||||
name = "${p_name}-${ver_maj}.${ver_min}";
|
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig intltool ];
|
|
||||||
|
|
||||||
buildInputs = [
|
|
||||||
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]);
|
|
||||||
|
|
||||||
configureFlags = [ "--with-gstreamer=1.0" ];
|
|
||||||
|
|
||||||
postInstall = stdenv.lib.optionalString withGstPlugins ''
|
|
||||||
wrapProgram "$out/bin/parole" --prefix \
|
|
||||||
GST_PLUGIN_SYSTEM_PATH_1_0 ":" "$GST_PLUGIN_SYSTEM_PATH_1_0"
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = {
|
|
||||||
homepage = "https://goodies.xfce.org/projects/applications/${p_name}";
|
|
||||||
description = "Modern simple media player";
|
|
||||||
platforms = stdenv.lib.platforms.linux;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@ -1,6 +1,5 @@
|
|||||||
{ mkXfceDerivation, dbus, dbus-glib
|
{ mkXfceDerivation, dbus, dbus-glib
|
||||||
, gst-plugins-bad, gst-plugins-base, gst-plugins-good
|
, gst_all_1, gtk3, libnotify, libxfce4ui, libxfce4util
|
||||||
, gst-plugins-ugly, gtk3, libnotify, libxfce4ui, libxfce4util
|
|
||||||
, taglib, xfconf }:
|
, taglib, xfconf }:
|
||||||
|
|
||||||
# Doesn't seem to find H.264 codec even though built with gst-plugins-bad.
|
# Doesn't seem to find H.264 codec even though built with gst-plugins-bad.
|
||||||
@ -17,7 +16,7 @@ mkXfceDerivation {
|
|||||||
--replace GST_BASE_CFLAGS GST_VIDEO_CFLAGS
|
--replace GST_BASE_CFLAGS GST_VIDEO_CFLAGS
|
||||||
'';
|
'';
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = with gst_all_1; [
|
||||||
dbus
|
dbus
|
||||||
dbus-glib
|
dbus-glib
|
||||||
gst-plugins-bad
|
gst-plugins-bad
|
||||||
@ -31,4 +30,8 @@ mkXfceDerivation {
|
|||||||
taglib
|
taglib
|
||||||
xfconf
|
xfconf
|
||||||
];
|
];
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "Modern simple media player";
|
||||||
|
};
|
||||||
}
|
}
|
||||||
@ -1,34 +0,0 @@
|
|||||||
{ stdenv, fetchurl, pkgconfig, intltool, libexif, gtk
|
|
||||||
, exo, dbus-glib, libxfce4util, libxfce4ui, xfconf
|
|
||||||
, hicolor-icon-theme, makeWrapper
|
|
||||||
}:
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
p_name = "ristretto";
|
|
||||||
ver_maj = "0.6";
|
|
||||||
ver_min = "3";
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2";
|
|
||||||
sha256 = "0y9d8w1plwp4vmxs44y8k8x15i0k0xln89k6jndhv6lf57g1cs1b";
|
|
||||||
};
|
|
||||||
name = "${p_name}-${ver_maj}.${ver_min}";
|
|
||||||
|
|
||||||
buildInputs =
|
|
||||||
[ pkgconfig intltool libexif gtk dbus-glib exo libxfce4util
|
|
||||||
libxfce4ui xfconf hicolor-icon-theme makeWrapper
|
|
||||||
];
|
|
||||||
|
|
||||||
postInstall = ''
|
|
||||||
wrapProgram "$out/bin/ristretto" \
|
|
||||||
--prefix XDG_DATA_DIRS : "${hicolor-icon-theme}/share"
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = {
|
|
||||||
homepage = "https://goodies.xfce.org/projects/applications/${p_name}";
|
|
||||||
description = "A fast and lightweight picture-viewer for the Xfce desktop environment";
|
|
||||||
license = stdenv.lib.licenses.gpl2Plus;
|
|
||||||
platforms = stdenv.lib.platforms.linux;
|
|
||||||
maintainers = [ stdenv.lib.maintainers.eelco ];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@ -10,4 +10,8 @@ mkXfceDerivation {
|
|||||||
|
|
||||||
nativeBuildInputs = [ exo ];
|
nativeBuildInputs = [ exo ];
|
||||||
buildInputs = [ glib gtk3 libexif libxfce4ui libxfce4util xfconf ];
|
buildInputs = [ glib gtk3 libexif libxfce4ui libxfce4util xfconf ];
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "A fast and lightweight picture-viewer for the Xfce desktop environment";
|
||||||
|
};
|
||||||
}
|
}
|
||||||
@ -1,25 +0,0 @@
|
|||||||
{ stdenv, fetchurl, pkgconfig, intltool, ncurses, gtk, vte, dbus-glib
|
|
||||||
, exo, libxfce4util, libxfce4ui
|
|
||||||
}:
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
p_name = "xfce4-terminal";
|
|
||||||
ver_maj = "0.6";
|
|
||||||
ver_min = "3";
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2";
|
|
||||||
sha256 = "023y0lkfijifh05yz8grimxadqpi98mrivr00sl18nirq8b4fbwi";
|
|
||||||
};
|
|
||||||
name = "${p_name}-${ver_maj}.${ver_min}";
|
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig ];
|
|
||||||
buildInputs = [ intltool exo gtk vte libxfce4util ncurses dbus-glib libxfce4ui ];
|
|
||||||
|
|
||||||
meta = {
|
|
||||||
homepage = https://www.xfce.org/projects/terminal;
|
|
||||||
description = "A modern terminal emulator primarily for the Xfce desktop environment";
|
|
||||||
license = stdenv.lib.licenses.gpl2Plus;
|
|
||||||
platforms = stdenv.lib.platforms.linux;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
12
pkgs/desktops/xfce/applications/xfburn/default.nix
Normal file
12
pkgs/desktops/xfce/applications/xfburn/default.nix
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
{ mkXfceDerivation, docbook_xsl, exo, gtk3, libburn, libisofs, libxfce4ui, libxslt }:
|
||||||
|
|
||||||
|
mkXfceDerivation {
|
||||||
|
category = "apps";
|
||||||
|
pname = "xfburn";
|
||||||
|
version = "0.6.1";
|
||||||
|
|
||||||
|
sha256 = "0a1ly79x7j5pgr3vbsabb4i0jd5rryaigj9z8iqzr8p9miypx20v";
|
||||||
|
|
||||||
|
nativeBuildInputs = [ libxslt docbook_xsl ];
|
||||||
|
buildInputs = [ exo gtk3 libburn libisofs libxfce4ui ];
|
||||||
|
}
|
||||||
@ -16,4 +16,8 @@ mkXfceDerivation {
|
|||||||
'';
|
'';
|
||||||
|
|
||||||
buildInputs = [ gtk3 libxfce4ui libxfce4util xfce4-panel ];
|
buildInputs = [ gtk3 libxfce4ui libxfce4util xfce4-panel ];
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "A Dictionary Client for the Xfce desktop environment";
|
||||||
|
};
|
||||||
}
|
}
|
||||||
@ -1,51 +0,0 @@
|
|||||||
{ stdenv, fetchurl, pkgconfig, intltool, makeWrapper
|
|
||||||
, glib, gstreamer, gst-plugins-base, gtk
|
|
||||||
, libxfce4util, libxfce4ui, xfce4-panel, xfconf, libunique ? null
|
|
||||||
, pulseaudioSupport ? false, gst-plugins-good
|
|
||||||
}:
|
|
||||||
|
|
||||||
let
|
|
||||||
# The usual Gstreamer plugins package has a zillion dependencies
|
|
||||||
# that we don't need for a simple mixer, so build a minimal package.
|
|
||||||
gst_plugins_minimal = gst-plugins-base.override {
|
|
||||||
minimalDeps = true;
|
|
||||||
};
|
|
||||||
gst_plugins_pulse = gst-plugins-good.override {
|
|
||||||
minimalDeps = true;
|
|
||||||
};
|
|
||||||
gst_plugins = [ gst_plugins_minimal ] ++ stdenv.lib.optional pulseaudioSupport gst_plugins_pulse;
|
|
||||||
|
|
||||||
in
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
p_name = "xfce4-mixer";
|
|
||||||
ver_maj = "4.10";
|
|
||||||
ver_min = "0";
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2";
|
|
||||||
sha256 = "1pnsd00583l7p5d80rxbh58brzy3jnccwikbbbm730a33c08kid8";
|
|
||||||
};
|
|
||||||
name = "${p_name}-${ver_maj}.${ver_min}";
|
|
||||||
|
|
||||||
buildInputs =
|
|
||||||
[ pkgconfig intltool glib gstreamer gtk
|
|
||||||
libxfce4util libxfce4ui xfce4-panel xfconf libunique makeWrapper
|
|
||||||
] ++ gst_plugins;
|
|
||||||
|
|
||||||
postInstall =
|
|
||||||
''
|
|
||||||
wrapProgram "$out/bin/xfce4-mixer" \
|
|
||||||
--prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH"
|
|
||||||
'';
|
|
||||||
|
|
||||||
passthru = { inherit gst_plugins; };
|
|
||||||
|
|
||||||
meta = {
|
|
||||||
homepage = https://www.xfce.org/projects/xfce4-mixer; # referenced but inactive
|
|
||||||
description = "A volume control application for the Xfce desktop environment";
|
|
||||||
license = stdenv.lib.licenses.gpl2Plus;
|
|
||||||
platforms = stdenv.lib.platforms.linux;
|
|
||||||
maintainers = [ stdenv.lib.maintainers.eelco ];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@ -1,32 +0,0 @@
|
|||||||
{ stdenv, fetchurl, pkgconfig, intltool, libnotify
|
|
||||||
, gtk , libxfce4util, libxfce4ui, xfconf, hicolor-icon-theme }:
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
p_name = "xfce4-notifyd";
|
|
||||||
ver_maj = "0.2";
|
|
||||||
ver_min = "4";
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2";
|
|
||||||
sha256 = "1l6fpfk0fkizdx7vwbyjdyzzj5i2ng8pf7r8j49nv0cnjhpxczlc";
|
|
||||||
};
|
|
||||||
name = "${p_name}-${ver_maj}.${ver_min}";
|
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig ];
|
|
||||||
buildInputs = [ intltool libnotify gtk libxfce4util libxfce4ui xfconf hicolor-icon-theme ];
|
|
||||||
|
|
||||||
preFixup = ''
|
|
||||||
# to be able to run the daemon we need it in PATH
|
|
||||||
ln -rs $out/lib/xfce4/notifyd/xfce4-notifyd $out/bin
|
|
||||||
'';
|
|
||||||
|
|
||||||
doCheck = true;
|
|
||||||
|
|
||||||
meta = {
|
|
||||||
homepage = "http://goodies.xfce.org/projects/applications/${p_name}";
|
|
||||||
description = "Notification daemon for Xfce";
|
|
||||||
license = stdenv.lib.licenses.gpl2Plus;
|
|
||||||
platforms = stdenv.lib.platforms.linux;
|
|
||||||
maintainers = [ stdenv.lib.maintainers.eelco ];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@ -9,4 +9,8 @@ mkXfceDerivation {
|
|||||||
sha256 = "1lmm9h3ych8dz9jpjkxg91f9ln14xs527nxjxsryks00kmqk4kai";
|
sha256 = "1lmm9h3ych8dz9jpjkxg91f9ln14xs527nxjxsryks00kmqk4kai";
|
||||||
|
|
||||||
buildInputs = [ exo gtk3 glib libnotify libxfce4ui libxfce4util xfce4-panel xfconf ];
|
buildInputs = [ exo gtk3 glib libnotify libxfce4ui libxfce4util xfce4-panel xfconf ];
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "Simple notification daemon for Xfce";
|
||||||
|
};
|
||||||
}
|
}
|
||||||
@ -1,29 +0,0 @@
|
|||||||
{ stdenv, fetchurl, pkgconfig, intltool, xfce4-panel, libxfce4util, gtk, libsoup
|
|
||||||
, glib-networking, exo, hicolor-icon-theme, wrapGAppsHook }:
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
p_name = "xfce4-screenshooter";
|
|
||||||
ver_maj = "1.8";
|
|
||||||
ver_min = "2";
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2";
|
|
||||||
sha256 = "9dce2ddfaa87f703e870e29bae13f3fc82a1b3f06b44f8386640e45a135f5f69";
|
|
||||||
};
|
|
||||||
name = "${p_name}-${ver_maj}.${ver_min}";
|
|
||||||
|
|
||||||
nativeBuildInputs = [
|
|
||||||
pkgconfig intltool wrapGAppsHook
|
|
||||||
];
|
|
||||||
|
|
||||||
buildInputs = [
|
|
||||||
xfce4-panel libxfce4util gtk libsoup exo hicolor-icon-theme glib-networking
|
|
||||||
];
|
|
||||||
|
|
||||||
meta = {
|
|
||||||
homepage = https://goodies.xfce.org/projects/applications/xfce4-screenshooter;
|
|
||||||
description = "Xfce screenshooter";
|
|
||||||
license = stdenv.lib.licenses.gpl2Plus;
|
|
||||||
platforms = stdenv.lib.platforms.linux;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@ -8,4 +8,8 @@ mkXfceDerivation {
|
|||||||
sha256 = "1h14sywvk9l06p3z1cpb79911j8w2wqbk03ldknjkia2rfymjk06";
|
sha256 = "1h14sywvk9l06p3z1cpb79911j8w2wqbk03ldknjkia2rfymjk06";
|
||||||
|
|
||||||
buildInputs = [ exo gtk3 libsoup libxfce4ui libxfce4util xfce4-panel glib-networking ];
|
buildInputs = [ exo gtk3 libsoup libxfce4ui libxfce4util xfce4-panel glib-networking ];
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "Screenshot utility for the Xfce desktop";
|
||||||
|
};
|
||||||
}
|
}
|
||||||
@ -1,22 +0,0 @@
|
|||||||
{ stdenv, fetchurl, intltool, pkgconfig, gtk, libwnck }:
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
p_name = "xfce4-taskmanager";
|
|
||||||
ver_maj = "1.1";
|
|
||||||
ver_min = "0";
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2";
|
|
||||||
sha256 = "1jwywmkkkmz7406m1jq40w6apiav25cznafhigbgpjv6z5hv27if";
|
|
||||||
};
|
|
||||||
name = "${p_name}-${ver_maj}.${ver_min}";
|
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig ];
|
|
||||||
buildInputs = [ intltool gtk libwnck ];
|
|
||||||
|
|
||||||
meta = {
|
|
||||||
homepage = "https://goodies.xfce.org/projects/applications/${p_name}";
|
|
||||||
description = "Easy to use task manager for Xfce";
|
|
||||||
platforms = stdenv.lib.platforms.linux;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@ -9,4 +9,8 @@ mkXfceDerivation {
|
|||||||
|
|
||||||
nativeBuildInputs = [ exo ];
|
nativeBuildInputs = [ exo ];
|
||||||
buildInputs = [ gtk3 libwnck3 libXmu ];
|
buildInputs = [ gtk3 libwnck3 libXmu ];
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "Easy to use task manager for Xfce";
|
||||||
|
};
|
||||||
}
|
}
|
||||||
@ -1,31 +0,0 @@
|
|||||||
{ stdenv, fetchurl, pkgconfig, libpulseaudio
|
|
||||||
, gtk2, libnotify
|
|
||||||
, keybinder, xfconf
|
|
||||||
}:
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
p_name = "xfce4-volumed-pulse";
|
|
||||||
ver_maj = "0.2";
|
|
||||||
ver_min = "2";
|
|
||||||
name = "${p_name}-${ver_maj}.${ver_min}";
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2";
|
|
||||||
sha256 = "0xjcs1b6ix6rwj9xgr9n89h315r3yhdm8wh5bkincd4lhz6ibhqf";
|
|
||||||
};
|
|
||||||
|
|
||||||
buildInputs =
|
|
||||||
[ libpulseaudio gtk2
|
|
||||||
keybinder xfconf libnotify
|
|
||||||
];
|
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig ];
|
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
|
||||||
homepage = https://launchpad.net/xfce4-volumed-pulse;
|
|
||||||
description = "A volume keys control daemon for the Xfce desktop environment (Xubuntu fork)";
|
|
||||||
license = licenses.gpl3;
|
|
||||||
platforms = platforms.linux;
|
|
||||||
maintainers = [ maintainers.abbradar ];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@ -10,6 +10,8 @@ mkXfceDerivation {
|
|||||||
buildInputs = [ gtk3 libnotify libpulseaudio keybinder3 xfconf ];
|
buildInputs = [ gtk3 libnotify libpulseaudio keybinder3 xfconf ];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
description = "A volume keys control daemon for Xfce using pulseaudio";
|
||||||
license = licenses.gpl3Plus;
|
license = licenses.gpl3Plus;
|
||||||
|
maintainers = [ maintainers.abbradar ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@ -1,27 +0,0 @@
|
|||||||
{ stdenv, fetchurl, pkgconfig, intltool, URI, glib, gtk, libxfce4ui, libxfce4util
|
|
||||||
, hicolor-icon-theme }:
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
p_name = "exo";
|
|
||||||
ver_maj = "0.10";
|
|
||||||
ver_min = "7";
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
|
|
||||||
sha256 = "521581481128af93e815f9690020998181f947ac9e9c2b232b1f144d76b1b35c";
|
|
||||||
};
|
|
||||||
name = "${p_name}-${ver_maj}.${ver_min}";
|
|
||||||
|
|
||||||
outputs = [ "out" "dev" "devdoc" ];
|
|
||||||
# lib/xfce4/exo-1/exo-compose-mail-1 is a perl script :-/
|
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig intltool ];
|
|
||||||
buildInputs = [ URI glib gtk libxfce4ui libxfce4util hicolor-icon-theme ];
|
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
|
||||||
homepage = "https://docs.xfce.org/xfce/${p_name}/start";
|
|
||||||
description = "Application library for the Xfce desktop environment";
|
|
||||||
license = licenses.gpl2Plus;
|
|
||||||
platforms = platforms.linux;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@ -1,14 +0,0 @@
|
|||||||
diff -urNZ a/garcon-gtk/garcon-gtk-menu.c b/garcon-gtk/garcon-gtk-menu.c
|
|
||||||
--- a/garcon-gtk/garcon-gtk-menu.c 2017-11-16 19:22:33.551926068 +0000
|
|
||||||
+++ b/garcon-gtk/garcon-gtk-menu.c 2017-11-16 19:23:33.055497211 +0000
|
|
||||||
@@ -676,6 +676,9 @@
|
|
||||||
G_CALLBACK (garcon_gtk_menu_deactivate), menu);
|
|
||||||
gtk_widget_show (mi);
|
|
||||||
|
|
||||||
+ /* submenu are child items, too. */
|
|
||||||
+ has_children = TRUE;
|
|
||||||
+
|
|
||||||
if (menu->priv->show_menu_icons)
|
|
||||||
{
|
|
||||||
icon_name = garcon_menu_element_get_icon_name (li->data);
|
|
||||||
Binary files a/.git/index and b/.git/index differ
|
|
||||||
@ -1,44 +0,0 @@
|
|||||||
From 222080e6d5fce85eb2a8a5c33df671bd9f21add8 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Yegor Timoshenko <yegortimoshenko@gmail.com>
|
|
||||||
Date: Thu, 14 Dec 2017 22:04:04 +0000
|
|
||||||
Subject: [PATCH] Decrement allocation counter on item unref (#12700)
|
|
||||||
|
|
||||||
---
|
|
||||||
garcon/garcon-menu-item-pool.c | 7 ++++++-
|
|
||||||
garcon/garcon-menu-item.c | 2 ++
|
|
||||||
2 files changed, 8 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/garcon/garcon-menu-item-pool.c b/garcon/garcon-menu-item-pool.c
|
|
||||||
index 2017180..355e520 100644
|
|
||||||
--- a/garcon/garcon-menu-item-pool.c
|
|
||||||
+++ b/garcon/garcon-menu-item-pool.c
|
|
||||||
@@ -191,7 +191,12 @@ garcon_menu_item_pool_filter_exclude (const gchar *desktop_id,
|
|
||||||
g_return_val_if_fail (GARCON_IS_MENU_ITEM (item), FALSE);
|
|
||||||
g_return_val_if_fail (node != NULL, FALSE);
|
|
||||||
|
|
||||||
- return garcon_menu_node_tree_rule_matches (node, item);
|
|
||||||
+ gboolean matches = garcon_menu_node_tree_rule_matches (node, item);
|
|
||||||
+
|
|
||||||
+ if (matches)
|
|
||||||
+ garcon_menu_item_increment_allocated (item);
|
|
||||||
+
|
|
||||||
+ return matches;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
diff --git a/garcon/garcon-menu-item.c b/garcon/garcon-menu-item.c
|
|
||||||
index 66a86bf..d61c88f 100644
|
|
||||||
--- a/garcon/garcon-menu-item.c
|
|
||||||
+++ b/garcon/garcon-menu-item.c
|
|
||||||
@@ -1516,6 +1516,8 @@ garcon_menu_item_unref (GarconMenuItem *item)
|
|
||||||
{
|
|
||||||
g_return_if_fail (GARCON_IS_MENU_ITEM (item));
|
|
||||||
|
|
||||||
+ garcon_menu_item_decrement_allocated (item);
|
|
||||||
+
|
|
||||||
/* Decrement the reference counter */
|
|
||||||
g_object_unref (G_OBJECT (item));
|
|
||||||
}
|
|
||||||
--
|
|
||||||
2.15.1
|
|
||||||
|
|
||||||
@ -1,27 +0,0 @@
|
|||||||
{ stdenv, fetchurl, pkgconfig, intltool, glib, libxfce4util, libxfce4ui, gtk }:
|
|
||||||
let
|
|
||||||
p_name = "garcon";
|
|
||||||
ver_maj = "0.4";
|
|
||||||
ver_min = "0";
|
|
||||||
in
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
name = "${p_name}-${ver_maj}.${ver_min}";
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
|
|
||||||
sha256 = "0wm9pjbwq53s3n3nwvsyf0q8lbmhiy2ln3bn5ncihr9vf5cwhzbq";
|
|
||||||
};
|
|
||||||
|
|
||||||
outputs = [ "out" "dev" ];
|
|
||||||
patches = [ ./garcon-10967.patch ./garcon-12700.patch ];
|
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig ];
|
|
||||||
buildInputs = [ intltool glib libxfce4util gtk libxfce4ui ];
|
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
|
||||||
homepage = https://www.xfce.org/;
|
|
||||||
description = "Xfce menu support library";
|
|
||||||
license = licenses.gpl2Plus;
|
|
||||||
platforms = platforms.linux;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@ -8,4 +8,8 @@ mkXfceDerivation {
|
|||||||
sha256 = "0pamhp1wffiw638s66nws2mpzmwkhvhb6iwccfy8b0kyr57wipjv";
|
sha256 = "0pamhp1wffiw638s66nws2mpzmwkhvhb6iwccfy8b0kyr57wipjv";
|
||||||
|
|
||||||
buildInputs = [ gtk3 libxfce4ui libxfce4util ];
|
buildInputs = [ gtk3 libxfce4ui libxfce4util ];
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "Xfce menu support library";
|
||||||
|
};
|
||||||
}
|
}
|
||||||
@ -1,31 +0,0 @@
|
|||||||
{ stdenv, fetchurl, pkgconfig, intltool, gtk2, withGtk3 ? false, gtk3 ? null }:
|
|
||||||
|
|
||||||
assert withGtk3 -> (gtk3 != null);
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
p_name = "gtk-xfce-engine";
|
|
||||||
ver_maj = "3.2";
|
|
||||||
ver_min = "0";
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
|
|
||||||
sha256 = "1va71f3gpl8gikfkmqsd5ikgp7qj8b64jii2l98g1ylnv8xrqp47";
|
|
||||||
};
|
|
||||||
name = "${p_name}-${ver_maj}.${ver_min}";
|
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig ];
|
|
||||||
buildInputs = [ intltool gtk2 ] ++ stdenv.lib.optional withGtk3 gtk3;
|
|
||||||
|
|
||||||
# `glib-mkenums' is unhappy that some source files are not valid UTF-8
|
|
||||||
postPatch = ''find . -type f -name '*.[ch]' -exec sed -r -i 's/\xD6/O/g' {} +'';
|
|
||||||
|
|
||||||
configureFlags = stdenv.lib.optional withGtk3 "--enable-gtk3";
|
|
||||||
|
|
||||||
meta = {
|
|
||||||
homepage = https://www.xfce.org/;
|
|
||||||
description = "GTK theme engine for Xfce";
|
|
||||||
license = stdenv.lib.licenses.gpl2Plus;
|
|
||||||
platforms = stdenv.lib.platforms.linux;
|
|
||||||
maintainers = [ stdenv.lib.maintainers.eelco ];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@ -1,41 +0,0 @@
|
|||||||
{ stdenv, fetchurl, pkgconfig, intltool, xorg, gtk, libxfce4util, xfconf
|
|
||||||
, libglade, libstartup_notification, hicolor-icon-theme
|
|
||||||
, withGtk3 ? false, gtk3
|
|
||||||
}:
|
|
||||||
let
|
|
||||||
p_name = "libxfce4ui";
|
|
||||||
ver_maj = "4.12";
|
|
||||||
ver_min = "1";
|
|
||||||
inherit (stdenv.lib) optional;
|
|
||||||
in
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
name = "${p_name}-${ver_maj}.${ver_min}";
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
|
|
||||||
sha256 = "3d619811bfbe7478bb984c16543d980cadd08586365a7bc25e59e3ca6384ff43";
|
|
||||||
};
|
|
||||||
|
|
||||||
outputs = [ "out" "dev" "devdoc" ];
|
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig intltool ];
|
|
||||||
|
|
||||||
buildInputs =
|
|
||||||
[ gtk libxfce4util xfconf libglade
|
|
||||||
libstartup_notification hicolor-icon-theme
|
|
||||||
] ++ optional withGtk3 gtk3;
|
|
||||||
|
|
||||||
propagatedBuildInputs = [ xorg.libICE xorg.libSM ];
|
|
||||||
|
|
||||||
#TODO: glade?
|
|
||||||
configureFlags = optional withGtk3 "--enable-gtk3";
|
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
|
||||||
homepage = https://www.xfce.org/;
|
|
||||||
description = "Basic GUI library for Xfce";
|
|
||||||
license = licenses.lgpl2Plus;
|
|
||||||
platforms = platforms.linux;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@ -1,26 +0,0 @@
|
|||||||
{ stdenv, fetchurl, pkgconfig, glib, intltool }:
|
|
||||||
let
|
|
||||||
p_name = "libxfce4util";
|
|
||||||
ver_maj = "4.12";
|
|
||||||
ver_min = "1";
|
|
||||||
in
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
name = "${p_name}-${ver_maj}.${ver_min}";
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
|
|
||||||
sha256 = "07c8r3xwx5is298zk77m3r784gmr5y4mh8bbca5zdjqk5vxdwsw7";
|
|
||||||
};
|
|
||||||
|
|
||||||
outputs = [ "out" "dev" "devdoc" ];
|
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig ];
|
|
||||||
buildInputs = [ glib intltool ];
|
|
||||||
|
|
||||||
meta = {
|
|
||||||
homepage = https://www.xfce.org/;
|
|
||||||
description = "Basic utility non-GUI functions for Xfce";
|
|
||||||
license = "bsd";
|
|
||||||
platforms = stdenv.lib.platforms.linux;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@ -1,37 +0,0 @@
|
|||||||
{ stdenv, fetchurl, pkgconfig, intltool, gtk
|
|
||||||
, libxfce4util, xfconf, libglade, libstartup_notification, hicolor-icon-theme }:
|
|
||||||
let
|
|
||||||
p_name = "libxfcegui4";
|
|
||||||
ver_maj = "4.10";
|
|
||||||
ver_min = "0";
|
|
||||||
in
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
name = "${p_name}-${ver_maj}.${ver_min}";
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
|
|
||||||
sha256 = "0cs5im0ib0cmr1lhr5765yliqjfyxvk4kwy8h1l8bn3mj6bzk0ib";
|
|
||||||
};
|
|
||||||
|
|
||||||
outputs = [ "out" "dev" "devdoc" ];
|
|
||||||
|
|
||||||
#TODO: gladeui
|
|
||||||
# By default, libxfcegui4 tries to install into libglade's prefix.
|
|
||||||
# Install into our own prefix instead.
|
|
||||||
configureFlags = [
|
|
||||||
"--with-libglade-module-path=$(out)/lib/libglade/2.0"
|
|
||||||
];
|
|
||||||
#NOTE: missing keyboard library support is OK according to the mailing-list
|
|
||||||
|
|
||||||
buildInputs =
|
|
||||||
[ pkgconfig intltool gtk libxfce4util xfconf libglade
|
|
||||||
libstartup_notification hicolor-icon-theme
|
|
||||||
];
|
|
||||||
|
|
||||||
meta = {
|
|
||||||
homepage = https://www.xfce.org/;
|
|
||||||
description = "Basic GUI library for Xfce";
|
|
||||||
license = stdenv.lib.licenses.lgpl2Plus;
|
|
||||||
platforms = stdenv.lib.platforms.linux;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@ -1,42 +0,0 @@
|
|||||||
{ stdenv, fetchurl, pkgconfig, intltool
|
|
||||||
, gtk, dbus-glib, libstartup_notification, libnotify, libexif, pcre, udev
|
|
||||||
, exo, libxfce4util, xfconf, xfce4-panel, hicolor-icon-theme, wrapGAppsHook
|
|
||||||
}:
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
p_name = "thunar";
|
|
||||||
ver_maj = "1.6";
|
|
||||||
ver_min = "10";
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/Thunar-${ver_maj}.${ver_min}.tar.bz2";
|
|
||||||
sha256 = "7e9d24067268900e5e44d3325e60a1a2b2f8f556ec238ec12574fbea15fdee8a";
|
|
||||||
};
|
|
||||||
|
|
||||||
name = "${p_name}-build-${ver_maj}.${ver_min}";
|
|
||||||
|
|
||||||
patches = [ ./thunarx_plugins_directory.patch ];
|
|
||||||
|
|
||||||
postPatch = ''
|
|
||||||
sed -i -e 's|thunar_dialogs_show_insecure_program (parent, _(".*"), file, exec)|1|' thunar/thunar-file.c
|
|
||||||
'';
|
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
|
|
||||||
buildInputs = [
|
|
||||||
intltool
|
|
||||||
gtk dbus-glib libstartup_notification libnotify libexif pcre udev
|
|
||||||
exo libxfce4util xfconf xfce4-panel
|
|
||||||
hicolor-icon-theme
|
|
||||||
];
|
|
||||||
# TODO: optionality?
|
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
|
||||||
|
|
||||||
meta = {
|
|
||||||
homepage = http://thunar.xfce.org/;
|
|
||||||
description = "Xfce file manager";
|
|
||||||
license = stdenv.lib.licenses.gpl2Plus;
|
|
||||||
platforms = stdenv.lib.platforms.linux;
|
|
||||||
maintainers = [ stdenv.lib.maintainers.eelco ];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@ -1,30 +0,0 @@
|
|||||||
{ stdenv, fetchurl, pkgconfig, intltool, exo, gtk, libxfce4util, libxfce4ui
|
|
||||||
, xfconf, udev, libgudev, libnotify, hicolor-icon-theme }:
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
p_name = "thunar-volman";
|
|
||||||
ver_maj = "0.8";
|
|
||||||
ver_min = "1";
|
|
||||||
name = "${p_name}-${ver_maj}.${ver_min}";
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
|
|
||||||
sha256 = "1gf259n1v3y23n1zlkhyr6r0i8j59rnl1cmxvxj6la9cwdfbn22s";
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
buildInputs =
|
|
||||||
[ pkgconfig intltool exo gtk udev libgudev libxfce4ui libxfce4util
|
|
||||||
xfconf libnotify hicolor-icon-theme
|
|
||||||
];
|
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
|
||||||
|
|
||||||
meta = {
|
|
||||||
homepage = https://goodies.xfce.org/projects/thunar-plugins/thunar-volman;
|
|
||||||
description = "Thunar extension for automatic management of removable drives and media";
|
|
||||||
license = stdenv.lib.licenses.gpl2Plus;
|
|
||||||
platforms = stdenv.lib.platforms.linux;
|
|
||||||
maintainers = [ stdenv.lib.maintainers.eelco ];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@ -8,4 +8,8 @@ mkXfceDerivation {
|
|||||||
buildInputs = [ exo gtk3 libgudev libxfce4ui libxfce4util xfconf ];
|
buildInputs = [ exo gtk3 libgudev libxfce4ui libxfce4util xfconf ];
|
||||||
|
|
||||||
sha256 = "1qrlpn0q5g9psd41l6y80r3bvbg8jaic92m6r400zzwcvivf95z0";
|
sha256 = "1qrlpn0q5g9psd41l6y80r3bvbg8jaic92m6r400zzwcvivf95z0";
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "Thunar extension for automatic management of removable drives and media";
|
||||||
|
};
|
||||||
}
|
}
|
||||||
@ -1,68 +0,0 @@
|
|||||||
{ stdenv, buildEnv, runCommand, makeWrapper, lndir, thunar-bare
|
|
||||||
, thunarPlugins ? []
|
|
||||||
}:
|
|
||||||
|
|
||||||
with stdenv.lib;
|
|
||||||
|
|
||||||
let
|
|
||||||
|
|
||||||
build = thunar-bare;
|
|
||||||
|
|
||||||
replaceLnExeListWithWrapped = exeDir: exeNameList: mkWrapArgs: ''
|
|
||||||
exeDir="${exeDir}"
|
|
||||||
oriDir=`realpath -e "$exeDir"`
|
|
||||||
unlink "$exeDir"
|
|
||||||
mkdir -p "$exeDir"
|
|
||||||
lndir "$oriDir" "$exeDir"
|
|
||||||
|
|
||||||
exeList="${concatStrings (intersperse " " (map (x: "${exeDir}/${x}") exeNameList))}"
|
|
||||||
|
|
||||||
for exe in $exeList; do
|
|
||||||
oriExe=`realpath -e "$exe"`
|
|
||||||
rm -f "$exe"
|
|
||||||
makeWrapper "$oriExe" "$exe" ${concatStrings (intersperse " " mkWrapArgs)}
|
|
||||||
done
|
|
||||||
'';
|
|
||||||
|
|
||||||
name = "${build.p_name}-${build.ver_maj}.${build.ver_min}";
|
|
||||||
|
|
||||||
meta = {
|
|
||||||
inherit (build.meta) homepage license platforms;
|
|
||||||
|
|
||||||
description = build.meta.description + optionalString
|
|
||||||
(0 != length thunarPlugins)
|
|
||||||
" (with plugins: ${concatStrings (intersperse ", " (map (x: x.name) thunarPlugins))})";
|
|
||||||
maintainers = build.meta.maintainers /*++ [ jraygauthier ]*/;
|
|
||||||
};
|
|
||||||
|
|
||||||
in
|
|
||||||
|
|
||||||
# TODO: To be replaced with `buildEnv` awaiting missing features.
|
|
||||||
runCommand name {
|
|
||||||
inherit build;
|
|
||||||
inherit meta;
|
|
||||||
|
|
||||||
nativeBuildInputs = [ makeWrapper lndir ];
|
|
||||||
|
|
||||||
dontPatchELF = true;
|
|
||||||
dontStrip = true;
|
|
||||||
|
|
||||||
}
|
|
||||||
(let
|
|
||||||
buildWithPlugins = buildEnv {
|
|
||||||
name = "thunar-bare-with-plugins";
|
|
||||||
paths = [ build ] ++ thunarPlugins;
|
|
||||||
};
|
|
||||||
|
|
||||||
in ''
|
|
||||||
mkdir -p $out
|
|
||||||
pushd ${buildWithPlugins} > /dev/null
|
|
||||||
for d in `find . -maxdepth 1 -name "*" -printf "%f\n" | tail -n+2`; do
|
|
||||||
ln -s "${buildWithPlugins}/$d" "$out/$d"
|
|
||||||
done
|
|
||||||
popd > /dev/null
|
|
||||||
|
|
||||||
${replaceLnExeListWithWrapped "$out/bin" [ "thunar" "thunar-settings" ] [
|
|
||||||
"--set THUNARX_MODULE_DIR \"${buildWithPlugins}/lib/thunarx-2\""
|
|
||||||
]}
|
|
||||||
'')
|
|
||||||
70
pkgs/desktops/xfce/core/thunar/default.nix
Normal file
70
pkgs/desktops/xfce/core/thunar/default.nix
Normal file
@ -0,0 +1,70 @@
|
|||||||
|
{ mkXfceDerivation
|
||||||
|
, lib
|
||||||
|
, docbook_xsl
|
||||||
|
, exo
|
||||||
|
, gdk-pixbuf
|
||||||
|
, gtk3
|
||||||
|
, libgudev
|
||||||
|
, libnotify
|
||||||
|
, libX11
|
||||||
|
, libxfce4ui
|
||||||
|
, libxfce4util
|
||||||
|
, libxslt
|
||||||
|
, xfconf
|
||||||
|
, gobject-introspection
|
||||||
|
, gvfs
|
||||||
|
, makeWrapper
|
||||||
|
, symlinkJoin
|
||||||
|
, thunarPlugins ? []
|
||||||
|
}:
|
||||||
|
|
||||||
|
let unwrapped = mkXfceDerivation {
|
||||||
|
category = "xfce";
|
||||||
|
pname = "thunar";
|
||||||
|
version = "1.8.9";
|
||||||
|
|
||||||
|
sha256 = "01w60csbs2nq1bhb8n1bnmjmx48fm0va3qbnq84z0h2dxpr80b1w";
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
docbook_xsl
|
||||||
|
gobject-introspection
|
||||||
|
libxslt
|
||||||
|
];
|
||||||
|
|
||||||
|
buildInputs = [
|
||||||
|
exo
|
||||||
|
gdk-pixbuf
|
||||||
|
gtk3
|
||||||
|
gvfs
|
||||||
|
libX11
|
||||||
|
libgudev
|
||||||
|
libnotify
|
||||||
|
libxfce4ui
|
||||||
|
libxfce4util
|
||||||
|
xfconf
|
||||||
|
];
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
./thunarx_plugins_directory.patch
|
||||||
|
];
|
||||||
|
|
||||||
|
# the desktop file … is in an insecure location»
|
||||||
|
# which pops up when invoking desktop files that are
|
||||||
|
# symlinks to the /nix/store
|
||||||
|
#
|
||||||
|
# this error was added by this commit:
|
||||||
|
# https://github.com/xfce-mirror/thunar/commit/1ec8ff89ec5a3314fcd6a57f1475654ddecc9875
|
||||||
|
postPatch = ''
|
||||||
|
sed -i -e 's|thunar_dialogs_show_insecure_program (parent, _(".*"), file, exec)|1|' thunar/thunar-file.c
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "Xfce file manager";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
in if thunarPlugins == [] then unwrapped
|
||||||
|
else import ./wrapper.nix {
|
||||||
|
inherit makeWrapper symlinkJoin thunarPlugins lib;
|
||||||
|
thunar = unwrapped;
|
||||||
|
}
|
||||||
@ -1,8 +1,8 @@
|
|||||||
diff --git a/thunarx/thunarx-provider-factory.c b/thunarx/thunarx-provider-factory.c
|
diff --git a/thunarx/thunarx-provider-factory.c b/thunarx/thunarx-provider-factory.c
|
||||||
index 31b8835..a3e7f4e 100644
|
index 94b11545..1f66c982 100644
|
||||||
--- a/thunarx/thunarx-provider-factory.c
|
--- a/thunarx/thunarx-provider-factory.c
|
||||||
+++ b/thunarx/thunarx-provider-factory.c
|
+++ b/thunarx/thunarx-provider-factory.c
|
||||||
@@ -141,12 +141,19 @@ static GList*
|
@@ -150,12 +150,19 @@ static GList*
|
||||||
thunarx_provider_factory_load_modules (ThunarxProviderFactory *factory)
|
thunarx_provider_factory_load_modules (ThunarxProviderFactory *factory)
|
||||||
{
|
{
|
||||||
ThunarxProviderModule *module;
|
ThunarxProviderModule *module;
|
||||||
@ -24,7 +24,7 @@ index 31b8835..a3e7f4e 100644
|
|||||||
{
|
{
|
||||||
/* determine the types for all existing plugins */
|
/* determine the types for all existing plugins */
|
||||||
diff --git a/thunarx/thunarx-provider-module.c b/thunarx/thunarx-provider-module.c
|
diff --git a/thunarx/thunarx-provider-module.c b/thunarx/thunarx-provider-module.c
|
||||||
index 023ad2a..6c21997 100644
|
index 023ad2ae..b1d1be8f 100644
|
||||||
--- a/thunarx/thunarx-provider-module.c
|
--- a/thunarx/thunarx-provider-module.c
|
||||||
+++ b/thunarx/thunarx-provider-module.c
|
+++ b/thunarx/thunarx-provider-module.c
|
||||||
@@ -174,10 +174,17 @@ static gboolean
|
@@ -174,10 +174,17 @@ static gboolean
|
||||||
@ -33,13 +33,13 @@ index 023ad2a..6c21997 100644
|
|||||||
ThunarxProviderModule *module = THUNARX_PROVIDER_MODULE (type_module);
|
ThunarxProviderModule *module = THUNARX_PROVIDER_MODULE (type_module);
|
||||||
+ const gchar *thunar_dir;
|
+ const gchar *thunar_dir;
|
||||||
gchar *path;
|
gchar *path;
|
||||||
+
|
|
||||||
+ thunar_dir = g_getenv("THUNARX_MODULE_DIR");
|
+ thunar_dir = g_getenv("THUNARX_MODULE_DIR");
|
||||||
+ if (NULL == thunar_dir)
|
+ if (NULL == thunar_dir)
|
||||||
+ {
|
+ {
|
||||||
+ thunar_dir = THUNARX_DIRECTORY;
|
+ thunar_dir = THUNARX_DIRECTORY;
|
||||||
+ }
|
+ }
|
||||||
|
+
|
||||||
/* load the module using the runtime link editor */
|
/* load the module using the runtime link editor */
|
||||||
- path = g_build_filename (THUNARX_DIRECTORY, type_module->name, NULL);
|
- path = g_build_filename (THUNARX_DIRECTORY, type_module->name, NULL);
|
||||||
+ path = g_build_filename (thunar_dir, type_module->name, NULL);
|
+ path = g_build_filename (thunar_dir, type_module->name, NULL);
|
||||||
34
pkgs/desktops/xfce/core/thunar/wrapper.nix
Normal file
34
pkgs/desktops/xfce/core/thunar/wrapper.nix
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
{ makeWrapper, symlinkJoin, thunar, thunarPlugins, lib }:
|
||||||
|
|
||||||
|
symlinkJoin {
|
||||||
|
name = "thunar-with-plugins-${thunar.version}";
|
||||||
|
|
||||||
|
paths = [ thunar ] ++ thunarPlugins;
|
||||||
|
|
||||||
|
buildInputs = [ makeWrapper ];
|
||||||
|
|
||||||
|
postBuild = ''
|
||||||
|
wrapProgram "$out/bin/thunar" \
|
||||||
|
--set "THUNARX_MODULE_DIR" "$out/lib/thunarx-3"
|
||||||
|
|
||||||
|
wrapProgram "$out/bin/thunar-settings" \
|
||||||
|
--set "THUNARX_MODULE_DIR" "$out/lib/thunarx-3"
|
||||||
|
|
||||||
|
for file in "lib/systemd/user/thunar.service" "share/dbus-1/services/org.xfce.FileManager.service" \
|
||||||
|
"share/dbus-1/services/org.xfce.Thunar.FileManager1.service" \
|
||||||
|
"share/dbus-1/services/org.xfce.Thunar.service"
|
||||||
|
do
|
||||||
|
rm -f "$out/$file"
|
||||||
|
substitute "${thunar}/$file" "$out/$file" \
|
||||||
|
--replace "${thunar}" "$out"
|
||||||
|
done
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
inherit (thunar.meta) homepage license platforms maintainers;
|
||||||
|
|
||||||
|
description = thunar.meta.description + optionalString
|
||||||
|
(0 != length thunarPlugins)
|
||||||
|
" (with plugins: ${concatStrings (intersperse ", " (map (x: x.name) thunarPlugins))})";
|
||||||
|
};
|
||||||
|
}
|
||||||
@ -1,42 +0,0 @@
|
|||||||
{ stdenv, fetchurl, pkgconfig, intltool, dbus-glib, gdk-pixbuf, curl, freetype
|
|
||||||
, libgsf, poppler, bzip2 }:
|
|
||||||
let
|
|
||||||
p_name = "tumbler";
|
|
||||||
ver_maj = "0.1";
|
|
||||||
ver_min = "31";
|
|
||||||
in
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
name = "${p_name}-${ver_maj}.${ver_min}";
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
|
|
||||||
sha256 = "0wvip28gm2w061hn84zp2q4dv947ihylrppahn4cjspzff935zfh";
|
|
||||||
};
|
|
||||||
|
|
||||||
outputs = [ "out" "dev" "devdoc" ];
|
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig ];
|
|
||||||
buildInputs = [
|
|
||||||
intltool dbus-glib gdk-pixbuf curl freetype
|
|
||||||
poppler libgsf bzip2
|
|
||||||
];
|
|
||||||
|
|
||||||
configureFlags = [
|
|
||||||
# Needs gst-tag
|
|
||||||
# "--enable-gstreamer-thumbnailer"
|
|
||||||
|
|
||||||
# Needs libffmpegthumbnailer
|
|
||||||
# "--enable-ffmpeg-thumbnailer"
|
|
||||||
|
|
||||||
"--enable-odf-thumbnailer"
|
|
||||||
"--enable-poppler-thumbnailer"
|
|
||||||
];
|
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
|
||||||
homepage = http://git.xfce.org/xfce/tumbler/;
|
|
||||||
description = "A D-Bus thumbnailer service";
|
|
||||||
platforms = platforms.linux;
|
|
||||||
license = licenses.gpl2;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
@ -32,4 +32,8 @@ mkXfceDerivation {
|
|||||||
postFixup = ''
|
postFixup = ''
|
||||||
wrapProgram $out/lib/tumbler-1/tumblerd "''${gappsWrapperArgs[@]}"
|
wrapProgram $out/lib/tumbler-1/tumblerd "''${gappsWrapperArgs[@]}"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "A D-Bus thumbnailer service";
|
||||||
|
};
|
||||||
}
|
}
|
||||||
@ -1,29 +0,0 @@
|
|||||||
{ stdenv, fetchurl, pkgconfig, intltool, glib, gtk, libxfce4util
|
|
||||||
, libxfce4ui, garcon, xfconf }:
|
|
||||||
let
|
|
||||||
p_name = "xfce4-appfinder";
|
|
||||||
ver_maj = "4.12";
|
|
||||||
ver_min = "0";
|
|
||||||
in
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
name = "${p_name}-${ver_maj}.${ver_min}";
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
|
|
||||||
sha256 = "0ry5hin8xhgnkmm9vs7jq8blk1cnbyr0s18nm1j6nsm7360abm1a";
|
|
||||||
};
|
|
||||||
|
|
||||||
buildInputs =
|
|
||||||
[ pkgconfig intltool glib gtk libxfce4util libxfce4ui garcon xfconf ];
|
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
|
||||||
homepage = http://docs.xfce.org/xfce/xfce4-appfinder/;
|
|
||||||
description = "Xfce application finder, a tool to locate and launch programs on your system";
|
|
||||||
license = licenses.gpl2Plus;
|
|
||||||
platforms = platforms.linux;
|
|
||||||
maintainers = [ maintainers.eelco ];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
@ -9,4 +9,8 @@ mkXfceDerivation {
|
|||||||
|
|
||||||
nativeBuildInputs = [ exo ];
|
nativeBuildInputs = [ exo ];
|
||||||
buildInputs = [ garcon gtk3 libxfce4ui libxfce4util xfconf ];
|
buildInputs = [ garcon gtk3 libxfce4ui libxfce4util xfconf ];
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "Appfinder for the Xfce4 Desktop Environment";
|
||||||
|
};
|
||||||
}
|
}
|
||||||
@ -1,28 +0,0 @@
|
|||||||
{ stdenv, fetchurl, pkgconfig, glib, autoconf, automake, libtool, intltool }:
|
|
||||||
let
|
|
||||||
p_name = "xfce4-dev-tools";
|
|
||||||
ver_maj = "4.12";
|
|
||||||
ver_min = "0";
|
|
||||||
in
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
name = "${p_name}-${ver_maj}.${ver_min}";
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
|
|
||||||
sha256 = "1jxmyp80pwbfgmqmwpjxs7z5dmm6pyf3qj62z20xy44izraadqz2";
|
|
||||||
};
|
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig ];
|
|
||||||
buildInputs = [ glib ];
|
|
||||||
|
|
||||||
# not needed to build it but to use it
|
|
||||||
propagatedBuildInputs = [ autoconf automake libtool intltool ];
|
|
||||||
|
|
||||||
meta = {
|
|
||||||
homepage = http://foo-projects.org/~benny/projects/xfce4-dev-tools/;
|
|
||||||
description = "Tools and M4 macros for Xfce4 developers";
|
|
||||||
license = stdenv.lib.licenses.gpl2Plus;
|
|
||||||
platforms = stdenv.lib.platforms.linux;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
@ -1,25 +0,0 @@
|
|||||||
--- ./scripts/xflock4.orig 2017-08-06 23:05:53.807688995 +0100
|
|
||||||
+++ ./scripts/xflock4 2017-08-06 23:09:06.171789989 +0100
|
|
||||||
@@ -24,12 +24,19 @
|
|
||||||
PATH=/bin:/usr/bin
|
|
||||||
export PATH
|
|
||||||
|
|
||||||
-# Lock by xscreensaver or gnome-screensaver, if a respective daemon is running
|
|
||||||
+# First test for the command set in the session's xfconf channel
|
|
||||||
+LOCK_CMD=$(xfconf-query -c xfce4-session -p /general/LockCommand)
|
|
||||||
+
|
|
||||||
+# Lock by xscreensaver, gnome-screensaver, or light-locker, if a respective daemon is running
|
|
||||||
for lock_cmd in \
|
|
||||||
+ "$LOCK_CMD" \
|
|
||||||
"xscreensaver-command -lock" \
|
|
||||||
- "gnome-screensaver-command --lock"
|
|
||||||
+ "gnome-screensaver-command --lock" \
|
|
||||||
+ "light-locker-command -l"
|
|
||||||
do
|
|
||||||
- $lock_cmd >/dev/null 2>&1 && exit
|
|
||||||
+ if [ ! -z "$lock_cmd" ]; then
|
|
||||||
+ $lock_cmd >/dev/null 2>&1 && exit
|
|
||||||
+ fi
|
|
||||||
done
|
|
||||||
|
|
||||||
# else run another access locking utility, if installed
|
|
||||||
@ -1,59 +0,0 @@
|
|||||||
{ stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfce4ui
|
|
||||||
, libxfce4ui_gtk3, libwnck, exo, garcon, xfconf, libstartup_notification
|
|
||||||
, makeWrapper, xfce4-mixer, hicolor-icon-theme, tzdata
|
|
||||||
, withGtk3 ? false, gtk3, gettext, glib-networking
|
|
||||||
}:
|
|
||||||
let
|
|
||||||
inherit (stdenv.lib) optional;
|
|
||||||
p_name = "xfce4-panel";
|
|
||||||
ver_maj = "4.12";
|
|
||||||
ver_min = "2";
|
|
||||||
in
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
name = "${p_name}-${ver_maj}.${ver_min}";
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
|
|
||||||
sha256 = "1s8cvsrgmkmmm84g6mghpj2k4777gm22g5lrsf8pdy5qh6xql1a2";
|
|
||||||
};
|
|
||||||
|
|
||||||
patches = [ ./xfce4-panel-datadir.patch ];
|
|
||||||
patchFlags = "-p1";
|
|
||||||
|
|
||||||
postPatch = ''
|
|
||||||
for f in $(find . -name \*.sh); do
|
|
||||||
substituteInPlace $f --replace gettext ${gettext}/bin/gettext
|
|
||||||
done
|
|
||||||
substituteInPlace plugins/clock/clock.c \
|
|
||||||
--replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" \
|
|
||||||
--replace "if (!g_file_test (filename, G_FILE_TEST_IS_SYMLINK))" ""
|
|
||||||
'';
|
|
||||||
|
|
||||||
outputs = [ "out" "dev" "devdoc" ];
|
|
||||||
|
|
||||||
buildInputs =
|
|
||||||
[ pkgconfig intltool gtk libxfce4util exo libwnck
|
|
||||||
garcon xfconf libstartup_notification makeWrapper hicolor-icon-theme
|
|
||||||
] ++ xfce4-mixer.gst_plugins
|
|
||||||
++ optional withGtk3 gtk3;
|
|
||||||
|
|
||||||
propagatedBuildInputs = [ (if withGtk3 then libxfce4ui_gtk3 else libxfce4ui) ];
|
|
||||||
|
|
||||||
configureFlags = optional withGtk3 "--enable-gtk3";
|
|
||||||
|
|
||||||
postInstall = ''
|
|
||||||
wrapProgram "$out/bin/xfce4-panel" \
|
|
||||||
--prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" \
|
|
||||||
--prefix GIO_EXTRA_MODULES : "${glib-networking}/lib/gio/modules"
|
|
||||||
'';
|
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
|
||||||
homepage = https://www.xfce.org/projects/xfce4-panel;
|
|
||||||
description = "Xfce panel";
|
|
||||||
license = licenses.gpl2Plus;
|
|
||||||
platforms = platforms.linux;
|
|
||||||
maintainers = [ maintainers.eelco ];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@ -10,7 +10,7 @@ mkXfceDerivation {
|
|||||||
nativeBuildInputs = [ gobject-introspection ];
|
nativeBuildInputs = [ gobject-introspection ];
|
||||||
buildInputs = [ exo garcon gtk2 gtk3 glib glib-networking libxfce4ui libxfce4util libwnck3 xfconf ];
|
buildInputs = [ exo garcon gtk2 gtk3 glib glib-networking libxfce4ui libxfce4util libwnck3 xfconf ];
|
||||||
|
|
||||||
patches = [ ../../xfce/core/xfce4-panel-datadir.patch ];
|
patches = [ ./xfce4-panel-datadir.patch ];
|
||||||
patchFlags = "-p1";
|
patchFlags = "-p1";
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
@ -1,44 +0,0 @@
|
|||||||
{ stdenv, lib, fetchurl, pkgconfig, intltool, glib, gtk, dbus-glib, upower, xfconf
|
|
||||||
, libxfce4ui, libxfce4util, libnotify, xfce4-panel, hicolor-icon-theme
|
|
||||||
, withGtk3 ? false, gtk3, libxfce4ui_gtk3, xfce4panel_gtk3 }:
|
|
||||||
let
|
|
||||||
p_name = "xfce4-power-manager";
|
|
||||||
ver_maj = if withGtk3 then "1.6" else "1.4";
|
|
||||||
ver_min = if withGtk3 then "0" else "4";
|
|
||||||
in
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
name = "${p_name}-${ver_maj}.${ver_min}";
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
|
|
||||||
sha256 =
|
|
||||||
if withGtk3
|
|
||||||
then "0avzhllpimcn7a6z9aa4jn0zg5ahxr9ks5ldchizycdb0rz1bqxx"
|
|
||||||
else "01rvqy1cif4s8lkidb7hhmsz7d9f2fwcwvc51xycaj3qgsmch3n5";
|
|
||||||
};
|
|
||||||
|
|
||||||
buildInputs =
|
|
||||||
[ pkgconfig intltool glib dbus-glib upower xfconf libxfce4util
|
|
||||||
libnotify hicolor-icon-theme
|
|
||||||
] ++
|
|
||||||
(if withGtk3
|
|
||||||
then [ gtk3 libxfce4ui_gtk3 xfce4panel_gtk3 ]
|
|
||||||
else [ gtk libxfce4ui xfce4-panel ]);
|
|
||||||
|
|
||||||
postPatch = lib.optionalString withGtk3 ''
|
|
||||||
substituteInPlace configure --replace gio-2.0 gio-unix-2.0
|
|
||||||
'';
|
|
||||||
|
|
||||||
postConfigure = lib.optionalString withGtk3 ''
|
|
||||||
substituteInPlace src/Makefile --replace "xfce4_power_manager_CFLAGS = " "xfce4_power_manager_CFLAGS = \$(GIO_CFLAGS) "
|
|
||||||
substituteInPlace settings/Makefile --replace "xfce4_power_manager_settings_CFLAGS = " "xfce4_power_manager_settings_CFLAGS = \$(GIO_CFLAGS) "
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
|
||||||
homepage = https://goodies.xfce.org/projects/applications/xfce4-power-manager;
|
|
||||||
description = "A power manager for the Xfce Desktop Environment";
|
|
||||||
license = licenses.gpl2Plus;
|
|
||||||
platforms = platforms.linux;
|
|
||||||
maintainers = [ maintainers.eelco ];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@ -16,4 +16,8 @@ mkXfceDerivation {
|
|||||||
automakeAddFlags src/Makefile.am xfce4_power_manager_CFLAGS GIO_CFLAGS
|
automakeAddFlags src/Makefile.am xfce4_power_manager_CFLAGS GIO_CFLAGS
|
||||||
automakeAddFlags settings/Makefile.am xfce4_power_manager_settings_CFLAGS GIO_CFLAGS
|
automakeAddFlags settings/Makefile.am xfce4_power_manager_settings_CFLAGS GIO_CFLAGS
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "A power manager for the Xfce Desktop Environment";
|
||||||
|
};
|
||||||
}
|
}
|
||||||
@ -1,44 +0,0 @@
|
|||||||
{ stdenv, fetchurl, pkgconfig, intltool, gtk, polkit
|
|
||||||
, libxfce4util, libxfce4ui, xfce4-panel, libwnck, dbus-glib, xfconf, libglade, xorg
|
|
||||||
, hicolor-icon-theme
|
|
||||||
}:
|
|
||||||
|
|
||||||
let
|
|
||||||
p_name = "xfce4-session";
|
|
||||||
ver_maj = "4.12";
|
|
||||||
ver_min = "1";
|
|
||||||
in
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
name = "${p_name}-${ver_maj}.${ver_min}";
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
|
|
||||||
sha256 = "97d7f2a2d0af7f3623b68d1f04091e02913b28f9555dab8b0d26c8a1299d08fd";
|
|
||||||
};
|
|
||||||
|
|
||||||
patches = [
|
|
||||||
# Fix "lock screen" not working for light-locker
|
|
||||||
./xfce4-light-locker.patch
|
|
||||||
];
|
|
||||||
|
|
||||||
buildInputs =
|
|
||||||
[ pkgconfig intltool gtk libxfce4util libxfce4ui libwnck dbus-glib
|
|
||||||
xfconf xfce4-panel libglade xorg.iceauth xorg.libSM
|
|
||||||
polkit hicolor-icon-theme
|
|
||||||
]; #TODO: upower-glib, gconf (assistive?), gnome keyring
|
|
||||||
|
|
||||||
preBuild = ''
|
|
||||||
sed '/^PATH=/d' -i scripts/xflock4
|
|
||||||
sed '/^export PATH$/d' -i scripts/xflock4
|
|
||||||
'';
|
|
||||||
|
|
||||||
configureFlags = [ "--with-xsession-prefix=$(out)" ];
|
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
|
||||||
homepage = https://www.xfce.org/projects/xfce4-session;
|
|
||||||
description = "Session manager for Xfce";
|
|
||||||
license = licenses.gpl2Plus;
|
|
||||||
platforms = platforms.linux;
|
|
||||||
maintainers = [ maintainers.eelco ];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@ -1,4 +1,4 @@
|
|||||||
{ mkXfceDerivation, polkit, exo, libxfce4util, libxfce4ui, xfconf, iceauth, gtk3, glib, libwnck3, xorg }:
|
{ mkXfceDerivation, polkit, exo, libxfce4util, libxfce4ui, xfconf, iceauth, gtk3, glib, libwnck3, xorg, xfce4-session }:
|
||||||
|
|
||||||
mkXfceDerivation {
|
mkXfceDerivation {
|
||||||
category = "xfce";
|
category = "xfce";
|
||||||
@ -14,6 +14,8 @@ mkXfceDerivation {
|
|||||||
# See https://github.com/NixOS/nixpkgs/issues/36468
|
# See https://github.com/NixOS/nixpkgs/issues/36468
|
||||||
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
|
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
|
||||||
|
|
||||||
|
passthru.xinitrc = "${xfce4-session}/etc/xdg/xfce4/xinitrc";
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "Session manager for Xfce";
|
description = "Session manager for Xfce";
|
||||||
};
|
};
|
||||||
@ -1,11 +0,0 @@
|
|||||||
--- a/xfsettingsd/xsettings.xml 2015-02-28 22:32:02.681796319 +0100
|
|
||||||
+++ b/xfsettingsd/xsettings.xml 2015-02-28 22:32:27.881214735 +0100
|
|
||||||
@@ -7,7 +7,7 @@
|
|
||||||
<channel name="xsettings" version="1.0">
|
|
||||||
<property name="Net" type="empty">
|
|
||||||
<property name="ThemeName" type="empty"/>
|
|
||||||
- <property name="IconThemeName" type="empty"/>
|
|
||||||
+ <property name="IconThemeName" type="string" value="Rodent"/>
|
|
||||||
<property name="DoubleClickTime" type="int" value="400"/>
|
|
||||||
<property name="DoubleClickDistance" type="int" value="5"/>
|
|
||||||
<property name="DndDragThreshold" type="int" value="8"/>
|
|
||||||
@ -1,54 +0,0 @@
|
|||||||
{ stdenv, fetchurl, pkgconfig, intltool, exo, gtk, garcon, libxfce4util
|
|
||||||
, libxfce4ui, xfconf, libXi, upower ? null, libnotify ? null
|
|
||||||
, libXcursor ? null, xf86inputlibinput ? null, libxklavier ? null }:
|
|
||||||
|
|
||||||
let
|
|
||||||
p_name = "xfce4-settings";
|
|
||||||
ver_maj = "4.12";
|
|
||||||
ver_min = "1";
|
|
||||||
in
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
name = "${p_name}-${ver_maj}.${ver_min}";
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
|
|
||||||
sha256 = "0x35i1cvkqp0hib1knwa58mckdwrfbhaisz4bsx6bbbx385llj7n";
|
|
||||||
};
|
|
||||||
|
|
||||||
patches = [ ./xfce4-settings-default-icon-theme.patch ];
|
|
||||||
|
|
||||||
postPatch = ''
|
|
||||||
for f in $(find . -name \*.c); do
|
|
||||||
substituteInPlace $f --replace \"libinput-properties.h\" '<xorg/libinput-properties.h>'
|
|
||||||
done
|
|
||||||
'';
|
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig intltool ];
|
|
||||||
|
|
||||||
buildInputs = [
|
|
||||||
exo
|
|
||||||
gtk
|
|
||||||
garcon
|
|
||||||
libxfce4util
|
|
||||||
libxfce4ui
|
|
||||||
xfconf
|
|
||||||
libXi
|
|
||||||
upower
|
|
||||||
libnotify
|
|
||||||
libXcursor
|
|
||||||
xf86inputlibinput
|
|
||||||
libxklavier
|
|
||||||
];
|
|
||||||
|
|
||||||
configureFlags = [ "--enable-pluggable-dialogs" "--enable-sound-settings" ];
|
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
|
||||||
homepage = https://www.xfce.org/projects/xfce4-settings;
|
|
||||||
description = "Settings manager for Xfce";
|
|
||||||
license = licenses.gpl2Plus;
|
|
||||||
platforms = platforms.linux;
|
|
||||||
maintainers = [ maintainers.eelco ];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@ -33,4 +33,8 @@ mkXfceDerivation {
|
|||||||
"--enable-pluggable-dialogs"
|
"--enable-pluggable-dialogs"
|
||||||
"--enable-sound-settings"
|
"--enable-sound-settings"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "Settings manager for Xfce";
|
||||||
|
};
|
||||||
}
|
}
|
||||||
@ -1,30 +0,0 @@
|
|||||||
{ stdenv, fetchurl, pkgconfig, intltool, glib, libxfce4util, dbus-glib }:
|
|
||||||
let
|
|
||||||
p_name = "xfconf";
|
|
||||||
ver_maj = "4.12";
|
|
||||||
ver_min = "1";
|
|
||||||
in
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
name = "${p_name}-${ver_maj}.${ver_min}";
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
|
|
||||||
sha256 = "0dns190bwb615wy9ma2654sw4vz1d0rcv061zmaalkv9wmj8bx1m";
|
|
||||||
};
|
|
||||||
|
|
||||||
outputs = [ "out" "dev" "devdoc" ];
|
|
||||||
|
|
||||||
#TODO: no perl bingings yet (ExtUtils::Depends, ExtUtils::PkgConfig, Glib)
|
|
||||||
nativeBuildInputs = [ pkgconfig ];
|
|
||||||
buildInputs = [ intltool glib libxfce4util ];
|
|
||||||
propagatedBuildInputs = [ dbus-glib ];
|
|
||||||
|
|
||||||
doCheck = false; # requires dbus daemon
|
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
|
||||||
homepage = http://docs.xfce.org/xfce/xfconf/start;
|
|
||||||
description = "Simple client-server configuration storage and query system for Xfce";
|
|
||||||
license = licenses.gpl2;
|
|
||||||
platforms = platforms.linux;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@ -8,4 +8,8 @@ mkXfceDerivation {
|
|||||||
sha256 = "1mbqc1463xgn7gafbh2fyshshdxin33iwk96y4nw2gl48nhx4sgs";
|
sha256 = "1mbqc1463xgn7gafbh2fyshshdxin33iwk96y4nw2gl48nhx4sgs";
|
||||||
|
|
||||||
buildInputs = [ libxfce4util ];
|
buildInputs = [ libxfce4util ];
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "Simple client-server configuration storage and query system for Xfce";
|
||||||
|
};
|
||||||
}
|
}
|
||||||
@ -1,36 +0,0 @@
|
|||||||
{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, gtk, libxfce4util, libxfce4ui
|
|
||||||
, libwnck, xfconf, libglade, xfce4-panel, thunar, exo, garcon, libnotify
|
|
||||||
, hicolor-icon-theme }:
|
|
||||||
let
|
|
||||||
p_name = "xfdesktop";
|
|
||||||
ver_maj = "4.12";
|
|
||||||
ver_min = "3";
|
|
||||||
in
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
name = "${p_name}-${ver_maj}.${ver_min}";
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
|
|
||||||
sha256 = "a8a8d93744d842ca6ac1f9bd2c8789ee178937bca7e170e5239cbdbef30520ac";
|
|
||||||
};
|
|
||||||
|
|
||||||
buildInputs = [
|
|
||||||
pkgconfig intltool gtk libxfce4util libxfce4ui libwnck xfconf
|
|
||||||
libglade xfce4-panel thunar exo garcon libnotify hicolor-icon-theme
|
|
||||||
];
|
|
||||||
|
|
||||||
patches = [(fetchpatch {
|
|
||||||
url = https://git.xfce.org/xfce/xfdesktop/patch?id=157f5b55cfc3629d595ef38984278de5915aac27;
|
|
||||||
sha256 = "0ki7hnyfpz7bdmsxqnm9qvyk040iyv1fawnhzfbyyzrh4nc5jd3x";
|
|
||||||
})];
|
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
|
||||||
homepage = https://www.xfce.org/projects/xfdesktop;
|
|
||||||
description = "Xfce desktop manager";
|
|
||||||
license = licenses.gpl2Plus;
|
|
||||||
platforms = platforms.linux;
|
|
||||||
maintainers = [ maintainers.eelco ];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@ -1,31 +0,0 @@
|
|||||||
{ stdenv, fetchurl, pkgconfig, gtk, intltool, libglade, libxfce4util
|
|
||||||
, libxfce4ui, xfconf, libwnck, libstartup_notification, xorg }:
|
|
||||||
let
|
|
||||||
p_name = "xfwm4";
|
|
||||||
ver_maj = "4.12";
|
|
||||||
ver_min = "4";
|
|
||||||
in
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
name = "${p_name}-${ver_maj}.${ver_min}";
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
|
|
||||||
sha256 = "0dpvdrd5lclkcrzmdpva38gfsgvdf3xkqfknvy96x6k4fn508x7s";
|
|
||||||
};
|
|
||||||
|
|
||||||
buildInputs =
|
|
||||||
[ pkgconfig intltool gtk libglade libxfce4util libxfce4ui xfconf
|
|
||||||
libwnck libstartup_notification
|
|
||||||
xorg.libXcomposite xorg.libXfixes xorg.libXdamage
|
|
||||||
];
|
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
|
||||||
homepage = https://www.xfce.org/projects/xfwm4;
|
|
||||||
description = "Window manager for Xfce";
|
|
||||||
license = licenses.gpl2Plus;
|
|
||||||
platforms = platforms.linux;
|
|
||||||
maintainers = [ maintainers.eelco ];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@ -23,4 +23,8 @@ mkXfceDerivation {
|
|||||||
libXpresent
|
libXpresent
|
||||||
xfconf
|
xfconf
|
||||||
];
|
];
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "Window manager for Xfce";
|
||||||
|
};
|
||||||
}
|
}
|
||||||
@ -3,91 +3,91 @@
|
|||||||
lib.makeScope pkgs.newScope (self: with self; {
|
lib.makeScope pkgs.newScope (self: with self; {
|
||||||
#### NixOS support
|
#### NixOS support
|
||||||
|
|
||||||
inherit (pkgs.gnome2) libglade vte gtksourceview;
|
|
||||||
inherit (pkgs.gnome3) dconf;
|
inherit (pkgs.gnome3) dconf;
|
||||||
inherit (pkgs.perlPackages) URI;
|
|
||||||
|
|
||||||
gtk = pkgs.gtk2;
|
mkXfceDerivation = callPackage ./mkXfceDerivation.nix { };
|
||||||
|
|
||||||
|
automakeAddFlags = pkgs.makeSetupHook { } ./automakeAddFlags.sh;
|
||||||
|
|
||||||
# Samba is a rather heavy dependency
|
# Samba is a rather heavy dependency
|
||||||
gvfs = pkgs.gvfs.override { samba = null; };
|
gvfs = pkgs.gvfs.override { samba = null; };
|
||||||
|
|
||||||
xinitrc = "${xfce4-session}/etc/xdg/xfce4/xinitrc";
|
|
||||||
|
|
||||||
#### CORE
|
#### CORE
|
||||||
|
|
||||||
exo = callPackage ./core/exo.nix { };
|
exo = callPackage ./core/exo { };
|
||||||
|
|
||||||
garcon = callPackage ./core/garcon.nix { };
|
garcon = callPackage ./core/garcon { };
|
||||||
|
|
||||||
# When built with GTK 3, it was breaking GTK 3 app layout
|
libxfce4ui = callPackage ./core/libxfce4ui { };
|
||||||
gtk-xfce-engine = callPackage ./core/gtk-xfce-engine.nix { withGtk3 = false; };
|
|
||||||
|
|
||||||
libxfce4ui = callPackage ./core/libxfce4ui.nix { };
|
libxfce4util = callPackage ./core/libxfce4util { };
|
||||||
|
|
||||||
libxfce4util = callPackage ./core/libxfce4util.nix { };
|
thunar = callPackage ./core/thunar {
|
||||||
|
thunarPlugins = [];
|
||||||
|
};
|
||||||
|
|
||||||
libxfcegui4 = callPackage ./core/libxfcegui4.nix { };
|
thunar-volman = callPackage ./core/thunar-volman { };
|
||||||
|
|
||||||
thunar-bare = callPackage ./core/thunar-build.nix { };
|
|
||||||
|
|
||||||
thunar = callPackage ./core/thunar.nix { };
|
|
||||||
|
|
||||||
# NB: thunar already has it
|
|
||||||
thunar-volman = callPackage ./core/thunar-volman.nix { };
|
|
||||||
|
|
||||||
thunar-archive-plugin = callPackage ./thunar-plugins/archive { };
|
thunar-archive-plugin = callPackage ./thunar-plugins/archive { };
|
||||||
|
|
||||||
thunar-dropbox-plugin = callPackage ./thunar-plugins/dropbox { };
|
thunar-dropbox-plugin = callPackage ./thunar-plugins/dropbox { };
|
||||||
|
|
||||||
tumbler = callPackage ./core/tumbler.nix { };
|
tumbler = callPackage ./core/tumbler { };
|
||||||
|
|
||||||
# TODO: impure plugins from /run/current-system/sw/lib/xfce4
|
xfce4-panel = callPackage ./core/xfce4-panel { };
|
||||||
xfce4-panel = callPackage ./core/xfce4-panel.nix { };
|
|
||||||
|
|
||||||
xfce4-session = callPackage ./core/xfce4-session.nix { };
|
xfce4-session = callPackage ./core/xfce4-session { };
|
||||||
|
|
||||||
xfce4-settings = callPackage ./core/xfce4-settings.nix { };
|
xfce4-settings = callPackage ./core/xfce4-settings { };
|
||||||
|
|
||||||
xfce4-power-manager = callPackage ./core/xfce4-power-manager.nix { };
|
xfce4-power-manager = callPackage ./core/xfce4-power-manager { };
|
||||||
|
|
||||||
xfconf = callPackage ./core/xfconf.nix { };
|
xfconf = callPackage ./core/xfconf { };
|
||||||
|
|
||||||
xfdesktop = callPackage ./core/xfdesktop.nix { };
|
xfdesktop = callPackage ./core/xfdesktop { };
|
||||||
|
|
||||||
xfwm4 = callPackage ./core/xfwm4.nix { };
|
xfwm4 = callPackage ./core/xfwm4 { };
|
||||||
|
|
||||||
xfce4-appfinder = callPackage ./core/xfce4-appfinder.nix { };
|
xfce4-appfinder = callPackage ./core/xfce4-appfinder { };
|
||||||
|
|
||||||
xfce4-dev-tools = callPackage ./core/xfce4-dev-tools.nix { };
|
xfce4-dev-tools = callPackage ./core/xfce4-dev-tools {
|
||||||
|
mkXfceDerivation = mkXfceDerivation.override {
|
||||||
|
xfce4-dev-tools = null;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
#### APPLICATIONS
|
#### APPLICATIONS
|
||||||
|
|
||||||
gigolo = callPackage ./applications/gigolo.nix { };
|
gigolo = callPackage ./applications/gigolo { };
|
||||||
|
|
||||||
mousepad = callPackage ./applications/mousepad.nix { };
|
mousepad = callPackage ./applications/mousepad { };
|
||||||
|
|
||||||
orage = callPackage ./applications/orage.nix { };
|
orage = callPackage ./applications/orage { };
|
||||||
|
|
||||||
parole = callPackage ./applications/parole.nix { };
|
parole = callPackage ./applications/parole { };
|
||||||
|
|
||||||
ristretto = callPackage ./applications/ristretto.nix { };
|
ristretto = callPackage ./applications/ristretto { };
|
||||||
|
|
||||||
xfce4-mixer = callPackage ./applications/xfce4-mixer.nix { };
|
xfce4-taskmanager = callPackage ./applications/xfce4-taskmanager { };
|
||||||
|
|
||||||
xfce4-mixer-pulse = callPackage ./applications/xfce4-mixer.nix { pulseaudioSupport = true; };
|
xfce4-dict = callPackage ./applications/xfce4-dict { };
|
||||||
|
|
||||||
xfce4-notifyd = callPackage ./applications/xfce4-notifyd.nix { };
|
xfce4-terminal = callPackage ./applications/xfce4-terminal { };
|
||||||
|
|
||||||
xfce4-taskmanager = callPackage ./applications/xfce4-taskmanager.nix { };
|
xfce4-screenshooter = callPackage ./applications/xfce4-screenshooter {
|
||||||
|
inherit (pkgs.gnome3) libsoup;
|
||||||
|
};
|
||||||
|
|
||||||
xfce4-terminal = callPackage ./applications/terminal.nix { };
|
xfdashbooard = callPackage ./applications/xfdashboard {};
|
||||||
|
|
||||||
xfce4-screenshooter = callPackage ./applications/xfce4-screenshooter.nix { };
|
# TODO: this repo is inactive for many years. Remove?
|
||||||
|
xfce4-volumed = callPackage ./applications/xfce4-volumed { };
|
||||||
|
|
||||||
xfce4-volumed = callPackage ./applications/xfce4-volumed.nix { };
|
xfce4-volumed-pulse = callPackage ./applications/xfce4-volumed-pulse { };
|
||||||
|
|
||||||
xfce4-volumed-pulse = callPackage ./applications/xfce4-volumed-pulse.nix { };
|
xfce4-notifyd = callPackage ./applications/xfce4-notifyd { };
|
||||||
|
|
||||||
|
xfburn = callPackage ./applications/xfburn { };
|
||||||
|
|
||||||
#### ART
|
#### ART
|
||||||
|
|
||||||
@ -99,15 +99,15 @@ lib.makeScope pkgs.newScope (self: with self; {
|
|||||||
|
|
||||||
xfce4-vala-panel-appmenu-plugin = callPackage ./panel-plugins/xfce4-vala-panel-appmenu-plugin { };
|
xfce4-vala-panel-appmenu-plugin = callPackage ./panel-plugins/xfce4-vala-panel-appmenu-plugin { };
|
||||||
|
|
||||||
xfce4-battery-plugin = callPackage ./panel-plugins/xfce4-battery-plugin.nix { };
|
xfce4-battery-plugin = callPackage ./panel-plugins/xfce4-battery-plugin { };
|
||||||
|
|
||||||
xfce4-clipman-plugin = callPackage ./panel-plugins/xfce4-clipman-plugin.nix { };
|
xfce4-clipman-plugin = callPackage ./panel-plugins/xfce4-clipman-plugin { };
|
||||||
|
|
||||||
xfce4-cpufreq-plugin = callPackage ./panel-plugins/xfce4-cpufreq-plugin.nix { };
|
xfce4-cpufreq-plugin = callPackage ./panel-plugins/xfce4-cpufreq-plugin { };
|
||||||
|
|
||||||
xfce4-cpugraph-plugin = callPackage ./panel-plugins/xfce4-cpugraph-plugin.nix { };
|
xfce4-cpugraph-plugin = callPackage ./panel-plugins/xfce4-cpugraph-plugin.nix { };
|
||||||
|
|
||||||
xfce4-datetime-plugin = callPackage ./panel-plugins/xfce4-datetime-plugin.nix { };
|
xfce4-datetime-plugin = callPackage ./panel-plugins/xfce4-datetime-plugin { };
|
||||||
|
|
||||||
xfce4-dict-plugin = callPackage ./panel-plugins/xfce4-dict-plugin.nix { };
|
xfce4-dict-plugin = callPackage ./panel-plugins/xfce4-dict-plugin.nix { };
|
||||||
|
|
||||||
@ -125,7 +125,7 @@ lib.makeScope pkgs.newScope (self: with self; {
|
|||||||
|
|
||||||
xfce4-namebar-plugin = callPackage ./panel-plugins/xfce4-namebar-plugin.nix { };
|
xfce4-namebar-plugin = callPackage ./panel-plugins/xfce4-namebar-plugin.nix { };
|
||||||
|
|
||||||
xfce4-netload-plugin = callPackage ./panel-plugins/xfce4-netload-plugin.nix { };
|
xfce4-netload-plugin = callPackage ./panel-plugins/xfce4-netload-plugin { };
|
||||||
|
|
||||||
xfce4-notes-plugin = callPackage ./panel-plugins/xfce4-notes-plugin.nix { };
|
xfce4-notes-plugin = callPackage ./panel-plugins/xfce4-notes-plugin.nix { };
|
||||||
|
|
||||||
@ -141,23 +141,15 @@ lib.makeScope pkgs.newScope (self: with self; {
|
|||||||
|
|
||||||
xfce4-verve-plugin = callPackage ./panel-plugins/xfce4-verve-plugin.nix { };
|
xfce4-verve-plugin = callPackage ./panel-plugins/xfce4-verve-plugin.nix { };
|
||||||
|
|
||||||
xfce4-xkb-plugin = callPackage ./panel-plugins/xfce4-xkb-plugin.nix { };
|
xfce4-xkb-plugin = callPackage ./panel-plugins/xfce4-xkb-plugin { };
|
||||||
|
|
||||||
xfce4-weather-plugin = callPackage ./panel-plugins/xfce4-weather-plugin.nix { };
|
xfce4-weather-plugin = callPackage ./panel-plugins/xfce4-weather-plugin.nix { };
|
||||||
|
|
||||||
xfce4-whiskermenu-plugin = callPackage ./panel-plugins/xfce4-whiskermenu-plugin.nix { };
|
xfce4-whiskermenu-plugin = callPackage ./panel-plugins/xfce4-whiskermenu-plugin { };
|
||||||
|
|
||||||
xfce4-windowck-plugin = callPackage ./panel-plugins/xfce4-windowck-plugin.nix { };
|
xfce4-windowck-plugin = callPackage ./panel-plugins/xfce4-windowck-plugin.nix { };
|
||||||
|
|
||||||
xfce4-pulseaudio-plugin = callPackage ./panel-plugins/xfce4-pulseaudio-plugin.nix { };
|
xfce4-pulseaudio-plugin = callPackage ./panel-plugins/xfce4-pulseaudio-plugin { };
|
||||||
|
|
||||||
#### GTK3 (deprecated, see NixOS/nixpkgs#32763)
|
|
||||||
|
|
||||||
libxfce4ui_gtk3 = libxfce4ui.override { withGtk3 = true; };
|
|
||||||
|
|
||||||
xfce4panel_gtk3 = xfce4-panel.override { withGtk3 = true; };
|
|
||||||
|
|
||||||
xfce4_power_manager_gtk3 = xfce4-power-manager.override { withGtk3 = true; };
|
|
||||||
|
|
||||||
} // lib.optionalAttrs (config.allowAliases or true) {
|
} // lib.optionalAttrs (config.allowAliases or true) {
|
||||||
#### ALIASES - added 2018-01
|
#### ALIASES - added 2018-01
|
||||||
@ -208,4 +200,21 @@ lib.makeScope pkgs.newScope (self: with self; {
|
|||||||
xfce4_whiskermenu_plugin = xfce4-whiskermenu-plugin;
|
xfce4_whiskermenu_plugin = xfce4-whiskermenu-plugin;
|
||||||
xfce4_windowck_plugin = xfce4-windowck-plugin;
|
xfce4_windowck_plugin = xfce4-windowck-plugin;
|
||||||
xfce4_pulseaudio_plugin = xfce4-pulseaudio-plugin;
|
xfce4_pulseaudio_plugin = xfce4-pulseaudio-plugin;
|
||||||
|
|
||||||
|
xfce4-mixer = throw "deprecated 2019-08-18: obsoleted by xfce4-pulseaudio-plugin"; # added 2019-08-18
|
||||||
|
gtk-xfce-engine = throw "deprecated 2019-09-17: Xfce 4.14 deprecated gtk-xfce-engine"; # added 2019-09-17
|
||||||
|
|
||||||
|
# added 2019-11-04
|
||||||
|
libxfce4ui_gtk3 = libxfce4ui;
|
||||||
|
xfce4panel_gtk3 = xfce4-panel;
|
||||||
|
xfce4_power_manager_gtk3 = xfce4-power-manager;
|
||||||
|
gtk = pkgs.gtk2;
|
||||||
|
libxfcegui4 = throw "libxfcegui4 is the deprecated Xfce GUI library. It has been superseded by the libxfce4ui library";
|
||||||
|
xinitrc = xfce4-session.xinitrc;
|
||||||
|
inherit (pkgs.gnome2) libglade;
|
||||||
|
inherit (pkgs.gnome3) vte gtksourceview;
|
||||||
|
xfce4-mixer-pulse = xfce4-mixer;
|
||||||
|
thunar-bare = thunar.override {
|
||||||
|
thunarPlugins = [];
|
||||||
|
};
|
||||||
})
|
})
|
||||||
|
|||||||
@ -1,24 +0,0 @@
|
|||||||
{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk, hicolor-icon-theme }:
|
|
||||||
|
|
||||||
with stdenv.lib;
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
p_name = "xfce4-battery-plugin";
|
|
||||||
ver_maj = "1.0";
|
|
||||||
ver_min = "5";
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2";
|
|
||||||
sha256 = "04gbplcj8z4vg5xbks8cc2jjf62mmf9sdymg90scjwmb82pv2ngn";
|
|
||||||
};
|
|
||||||
name = "${p_name}-${ver_maj}.${ver_min}";
|
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig ];
|
|
||||||
buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk hicolor-icon-theme ];
|
|
||||||
|
|
||||||
meta = {
|
|
||||||
homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
|
|
||||||
description = "Battery plugin for Xfce panel";
|
|
||||||
platforms = platforms.linux;
|
|
||||||
maintainers = [ maintainers.AndersonTorres ];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@ -8,4 +8,8 @@ mkXfceDerivation rec {
|
|||||||
sha256 = "0329miiclc8da6j0sz495p99hyrf9fjhvpmdl0556fphybz5agc0";
|
sha256 = "0329miiclc8da6j0sz495p99hyrf9fjhvpmdl0556fphybz5agc0";
|
||||||
|
|
||||||
buildInputs = [ gtk3 libxfce4ui libxfce4util xfce4-panel xfconf ];
|
buildInputs = [ gtk3 libxfce4ui libxfce4util xfce4-panel xfconf ];
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "Battery plugin for Xfce panel";
|
||||||
|
};
|
||||||
}
|
}
|
||||||
@ -1,24 +0,0 @@
|
|||||||
{ stdenv, fetchurl, pkgconfig, intltool, glib, exo, libXtst, xorgproto, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk, hicolor-icon-theme }:
|
|
||||||
|
|
||||||
with stdenv.lib;
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
p_name = "xfce4-clipman-plugin";
|
|
||||||
ver_maj = "1.2";
|
|
||||||
ver_min = "6";
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2";
|
|
||||||
sha256 = "19a8gwcqc0r5qqi8w28dc8arqip34m8yxdb87lgps9g5qfcky113";
|
|
||||||
};
|
|
||||||
name = "${p_name}-${ver_maj}.${ver_min}";
|
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig ];
|
|
||||||
buildInputs = [ intltool glib exo libXtst xorgproto libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk hicolor-icon-theme ];
|
|
||||||
|
|
||||||
meta = {
|
|
||||||
homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
|
|
||||||
description = "Clipboard manager for Xfce panel";
|
|
||||||
platforms = platforms.linux;
|
|
||||||
maintainers = [ maintainers.AndersonTorres ];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@ -8,4 +8,8 @@ mkXfceDerivation rec {
|
|||||||
sha256 = "1xk79xh1zk0x4r1z9m1dakp79pip0zh3naviybvl1dnpwwfc03gq";
|
sha256 = "1xk79xh1zk0x4r1z9m1dakp79pip0zh3naviybvl1dnpwwfc03gq";
|
||||||
|
|
||||||
buildInputs = [ exo gtk3 libXtst libxfce4ui libxfce4util xfce4-panel xfconf ];
|
buildInputs = [ exo gtk3 libXtst libxfce4ui libxfce4util xfce4-panel xfconf ];
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "Clipboard manager for Xfce panel";
|
||||||
|
};
|
||||||
}
|
}
|
||||||
@ -1,29 +0,0 @@
|
|||||||
{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk, hicolor-icon-theme }:
|
|
||||||
|
|
||||||
with stdenv.lib;
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
p_name = "xfce4-cpufreq-plugin";
|
|
||||||
ver_maj = "1.1";
|
|
||||||
ver_min = "3";
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2";
|
|
||||||
sha256 = "0crd21l5cw0xgm6w7s049xa36k203yx7l56ssnah9nq1w73n58bl";
|
|
||||||
};
|
|
||||||
|
|
||||||
name = "${p_name}-${ver_maj}.${ver_min}";
|
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig intltool ];
|
|
||||||
|
|
||||||
buildInputs = [ libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk hicolor-icon-theme ];
|
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
|
||||||
|
|
||||||
meta = {
|
|
||||||
homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
|
|
||||||
description = "CPU Freq load plugin for Xfce panel";
|
|
||||||
license = [ licenses.gpl2Plus ];
|
|
||||||
platforms = platforms.linux;
|
|
||||||
maintainers = [ maintainers.AndersonTorres ];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@ -7,4 +7,8 @@ mkXfceDerivation {
|
|||||||
sha256 = "1p7c4g3yfc19ksdckxpzq1q35jvplh5g55299cvv0afhdb5l8zhv";
|
sha256 = "1p7c4g3yfc19ksdckxpzq1q35jvplh5g55299cvv0afhdb5l8zhv";
|
||||||
|
|
||||||
buildInputs = [ gtk3 libxfce4ui libxfce4util xfce4-panel xfconf ];
|
buildInputs = [ gtk3 libxfce4ui libxfce4util xfce4-panel xfconf ];
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "CPU Freq load plugin for Xfce panel";
|
||||||
|
};
|
||||||
}
|
}
|
||||||
@ -1,4 +1,4 @@
|
|||||||
{ stdenv, fetchurl, pkgconfig, intltool, glib, exo, libXtst, xorgproto, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk, hicolor-icon-theme }:
|
{ stdenv, fetchurl, pkgconfig, intltool, glib, exo, libXtst, xorgproto, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk2, hicolor-icon-theme }:
|
||||||
|
|
||||||
with stdenv.lib;
|
with stdenv.lib;
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
|||||||
name = "${p_name}-${ver_maj}.${ver_min}";
|
name = "${p_name}-${ver_maj}.${ver_min}";
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig ];
|
nativeBuildInputs = [ pkgconfig ];
|
||||||
buildInputs = [ intltool glib exo libXtst xorgproto libxfce4util libxfce4ui xfce4-panel xfconf gtk hicolor-icon-theme ];
|
buildInputs = [ intltool glib exo libXtst xorgproto libxfce4util libxfce4ui xfce4-panel xfconf gtk2 hicolor-icon-theme ];
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
|
homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
|
||||||
|
|||||||
@ -1,26 +0,0 @@
|
|||||||
{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, libxfcegui4, xfce4-panel
|
|
||||||
, gtk }:
|
|
||||||
|
|
||||||
with stdenv.lib;
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
p_name = "xfce4-datetime-plugin";
|
|
||||||
ver_maj = "0.6";
|
|
||||||
ver_min = "2";
|
|
||||||
|
|
||||||
name = "${p_name}-${ver_maj}.${ver_min}";
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2";
|
|
||||||
sha256 = "0b4yril07qgkmywjym1qp12r4g35bnh96879zbjps7cd3rkxld4p";
|
|
||||||
};
|
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig ];
|
|
||||||
buildInputs = [ intltool libxfce4util libxfcegui4 xfce4-panel gtk ];
|
|
||||||
|
|
||||||
meta = {
|
|
||||||
homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
|
|
||||||
description = "Shows the date and time in the panel, and a calendar appears when you left-click on it";
|
|
||||||
platforms = platforms.linux;
|
|
||||||
maintainers = [ maintainers.AndersonTorres ];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@ -0,0 +1,34 @@
|
|||||||
|
{ mkXfceDerivation
|
||||||
|
, stdenv
|
||||||
|
, intltool
|
||||||
|
, libxfce4ui
|
||||||
|
, xfce4-panel
|
||||||
|
, gtk3
|
||||||
|
, gettext
|
||||||
|
}:
|
||||||
|
|
||||||
|
mkXfceDerivation rec {
|
||||||
|
category = "panel-plugins";
|
||||||
|
pname = "xfce4-datetime-plugin";
|
||||||
|
version = "0.8.0";
|
||||||
|
|
||||||
|
rev = "datetime-${version}";
|
||||||
|
|
||||||
|
sha256 = "12drh7y70d70r93lpv43fkj5cbyl0vciz4a41nxrknrfbhxrvyah";
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
gettext
|
||||||
|
intltool
|
||||||
|
];
|
||||||
|
|
||||||
|
buildInputs = [
|
||||||
|
gtk3
|
||||||
|
libxfce4ui
|
||||||
|
xfce4-panel
|
||||||
|
];
|
||||||
|
|
||||||
|
meta = with stdenv.lib; {
|
||||||
|
description = "Shows the date and time in the panel, and a calendar appears when you left-click on it";
|
||||||
|
maintainers = [ maintainers.AndersonTorres ];
|
||||||
|
};
|
||||||
|
}
|
||||||
@ -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;
|
with stdenv.lib;
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
|||||||
name = "${p_name}-${ver_maj}.${ver_min}";
|
name = "${p_name}-${ver_maj}.${ver_min}";
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig ];
|
nativeBuildInputs = [ pkgconfig ];
|
||||||
buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk ];
|
buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel xfconf gtk2 ];
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
|
homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
|
||||||
|
|||||||
@ -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;
|
with stdenv.lib;
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
@ -13,12 +13,13 @@ stdenv.mkDerivation rec {
|
|||||||
name = "${p_name}-${ver_maj}.${ver_min}";
|
name = "${p_name}-${ver_maj}.${ver_min}";
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig ];
|
nativeBuildInputs = [ pkgconfig ];
|
||||||
buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk ];
|
buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel xfconf gtk2 ];
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
|
homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
|
||||||
description = "Eyes following you!";
|
description = "Eyes following you!";
|
||||||
platforms = platforms.linux;
|
platforms = platforms.linux;
|
||||||
maintainers = [ maintainers.AndersonTorres ];
|
maintainers = [ maintainers.AndersonTorres ];
|
||||||
|
broken = true;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@ -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;
|
with stdenv.lib;
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
@ -13,12 +13,13 @@ stdenv.mkDerivation rec {
|
|||||||
name = "${p_name}-${ver_maj}.${ver_min}";
|
name = "${p_name}-${ver_maj}.${ver_min}";
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig ];
|
nativeBuildInputs = [ pkgconfig ];
|
||||||
buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk ];
|
buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel xfconf gtk2 ];
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
|
homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
|
||||||
description = "Filesystem monitor";
|
description = "Filesystem monitor";
|
||||||
platforms = platforms.linux;
|
platforms = platforms.linux;
|
||||||
maintainers = [ maintainers.AndersonTorres ];
|
maintainers = [ maintainers.AndersonTorres ];
|
||||||
|
broken = true;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@ -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;
|
with stdenv.lib;
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
@ -13,12 +13,13 @@ stdenv.mkDerivation rec {
|
|||||||
name = "${p_name}-${ver_maj}.${ver_min}";
|
name = "${p_name}-${ver_maj}.${ver_min}";
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig ];
|
nativeBuildInputs = [ pkgconfig ];
|
||||||
buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk ];
|
buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel xfconf gtk2 ];
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
|
homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
|
||||||
description = "Cyclically spawns a command and captures its output";
|
description = "Cyclically spawns a command and captures its output";
|
||||||
platforms = platforms.linux;
|
platforms = platforms.linux;
|
||||||
maintainers = [ maintainers.AndersonTorres ];
|
maintainers = [ maintainers.AndersonTorres ];
|
||||||
|
broken = true;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui,
|
{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui,
|
||||||
libxfcegui4, xfconf, gtk, exo, gnutls, libgcrypt }:
|
xfconf, gtk2, exo, gnutls, libgcrypt }:
|
||||||
|
|
||||||
with stdenv.lib;
|
with stdenv.lib;
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
@ -15,12 +15,13 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig ];
|
nativeBuildInputs = [ pkgconfig ];
|
||||||
buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel
|
buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel
|
||||||
libxfcegui4 xfconf gtk exo gnutls libgcrypt ];
|
xfconf gtk2 exo gnutls libgcrypt ];
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
|
homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
|
||||||
description = "Mailwatch plugin for Xfce panel";
|
description = "Mailwatch plugin for Xfce panel";
|
||||||
platforms = platforms.linux;
|
platforms = platforms.linux;
|
||||||
maintainers = [ ];
|
maintainers = [ ];
|
||||||
|
broken = true;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui,
|
{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui,
|
||||||
libxfcegui4, xfconf, gtk, exo }:
|
xfconf, gtk2, exo }:
|
||||||
|
|
||||||
with stdenv.lib;
|
with stdenv.lib;
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
@ -15,12 +15,13 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig ];
|
nativeBuildInputs = [ pkgconfig ];
|
||||||
buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel
|
buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel
|
||||||
libxfcegui4 xfconf gtk exo ];
|
xfconf gtk2 exo ];
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
|
homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
|
||||||
description = "MPD plugin for Xfce panel";
|
description = "MPD plugin for Xfce panel";
|
||||||
platforms = platforms.linux;
|
platforms = platforms.linux;
|
||||||
maintainers = [ ];
|
maintainers = [ ];
|
||||||
|
broken = true;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,24 +0,0 @@
|
|||||||
{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk, hicolor-icon-theme }:
|
|
||||||
|
|
||||||
with stdenv.lib;
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
p_name = "xfce4-netload-plugin";
|
|
||||||
ver_maj = "1.2";
|
|
||||||
ver_min = "4";
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2";
|
|
||||||
sha256 = "1lrhhzxmybcfl52hnadr2dvasis9wmk6a48pcy02s09ch8cfkb7z";
|
|
||||||
};
|
|
||||||
name = "${p_name}-${ver_maj}.${ver_min}";
|
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig ];
|
|
||||||
buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk hicolor-icon-theme ];
|
|
||||||
|
|
||||||
meta = {
|
|
||||||
homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
|
|
||||||
description = "Battery plugin for Xfce panel";
|
|
||||||
platforms = platforms.linux;
|
|
||||||
maintainers = [ maintainers.AndersonTorres ];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@ -8,4 +8,8 @@ mkXfceDerivation rec {
|
|||||||
sha256 = "0nm8advafw4jpc9p1qszyfqa56194sz51z216rdh4c6ilcrrpy1h";
|
sha256 = "0nm8advafw4jpc9p1qszyfqa56194sz51z216rdh4c6ilcrrpy1h";
|
||||||
|
|
||||||
buildInputs = [ gtk3 libxfce4ui libxfce4util xfce4-panel xfconf ];
|
buildInputs = [ gtk3 libxfce4ui libxfce4util xfce4-panel xfconf ];
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "Battery plugin for Xfce panel";
|
||||||
|
};
|
||||||
}
|
}
|
||||||
@ -1,4 +1,4 @@
|
|||||||
{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk, libunique }:
|
{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk2, libunique }:
|
||||||
|
|
||||||
with stdenv.lib;
|
with stdenv.lib;
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
|||||||
name = "${p_name}-${ver_maj}.${ver_min}";
|
name = "${p_name}-${ver_maj}.${ver_min}";
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig ];
|
nativeBuildInputs = [ pkgconfig ];
|
||||||
buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk libunique ];
|
buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel xfconf gtk2 libunique ];
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
|
homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user