JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #66519 from volth/xfce-4.14

Browse Source 
xfce4-14: 4.14.pre2 -> 4.14
This commit is contained in:
worldofpeace 2019-08-18 18:56:58 -04:00 committed by GitHub
commit 9339185880
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
28 changed files with 125 additions and 159 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/desktops/xfce4-14/exo/default.nix
View File

@ -1,26 +1,18 @@
{ mkXfceDerivation, docbook_xsl, libxslt, perlPackages, gtk3
{ mkXfceDerivation, docbook_xsl, glib, libxslt, perlPackages, gtk3
, libxfce4ui, libxfce4util }:
mkXfceDerivation rec {
category = "xfce";
pname = "exo";
version = "4.14pre2";
rev = "xfce-4.14pre2";
version = "0.12.8";
sha256 = "0s91fv4yzafmdi25c63yin15sa25cfcyarpvavr4q3mmmiamzpi0";
sha256 = "013am7q4pwfncf4hk2a3hv7yx2vxgzb5xm8qsi9mxkj29xdhrvs5";
nativeBuildInputs = [ libxslt perlPackages.URI ];
buildInputs = [ gtk3 libxfce4ui libxfce4util ];
nativeBuildInputs = [ libxslt perlPackages.URI docbook_xsl ];
buildInputs = [ gtk3 glib libxfce4ui libxfce4util ];
postPatch = ''
substituteInPlace exo-helper/Makefile.am \
--replace 'exo_helper_2_CFLAGS =' \
'exo_helper_2_CFLAGS = $(GIO_UNIX_CFLAGS)'
substituteInPlace docs/reference/Makefile.am \
--replace http://docbook.sourceforge.net/release/xsl/current \
${docbook_xsl}/share/xml/docbook-xsl
'';
# Workaround https://bugzilla.xfce.org/show_bug.cgi?id=15825
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
meta = {
description = "Application library for Xfce";

5
pkgs/desktops/xfce4-14/garcon/default.nix
View File

@ -3,10 +3,9 @@
mkXfceDerivation rec {
category = "xfce";
pname = "garcon";
version = "4.14pre2";
rev = "xfce-4.14pre2";
version = "0.6.4";
sha256 = "0d2fir4vbfdmng9k70nf5zv3fjwgr6g0czrp458x6qswih2gv2ik";
sha256 = "0pamhp1wffiw638s66nws2mpzmwkhvhb6iwccfy8b0kyr57wipjv";
buildInputs = [ gtk3 libxfce4ui libxfce4util ];
}

8
pkgs/desktops/xfce4-14/gigolo/default.nix
View File

@ -1,12 +1,12 @@
{ mkXfceDerivation, exo, gtk3 }:
{ mkXfceDerivation, exo, gtk3, gvfs, glib }:
mkXfceDerivation rec {
category = "apps";
pname = "gigolo";
version = "0.4.91";
version = "0.5.0";
sha256 = "1r075hw1jxbpv7jxzyqgfmd2rsw1lykd7snnx736gm55v84k15i7";
sha256 = "1lqsxb0d5i8p9vbzx8s4p3rga7va5h1q146xgmsa41j5v40wrlw6";
nativeBuildInputs = [ exo ];
buildInputs = [ gtk3 ];
buildInputs = [ gtk3 glib gvfs ];
}

14
pkgs/desktops/xfce4-14/libxfce4ui/default.nix
View File

@ -1,17 +1,21 @@
{ lib, mkXfceDerivation, gobject-introspection, gtk2, gtk3, libICE, libSM
, libstartup_notification ? null, libxfce4util, xfconf }:
, libstartup_notification, libxfce4util, xfconf }:
mkXfceDerivation rec {
category = "xfce";
pname = "libxfce4ui";
version = "4.14pre2";
rev = "xfce-4.14pre2";
version = "4.14.1";
sha256 = "0kvqzf91ygxxkcy4drjminby4c3c42c54a3if8jwx0zmgbml7l8q";
sha256 = "0fnncf30s51qhgixn57z4d021pjjhzgsg2x69w4dy68vff2347qy";
buildInputs = [ gobject-introspection gtk2 gtk3 libstartup_notification xfconf ];
nativeBuildInputs = [ gobject-introspection ];
buildInputs = [ gtk2 gtk3 libstartup_notification xfconf ];
propagatedBuildInputs = [ libxfce4util libICE libSM ];
configureFlags = [
"--with-vendor-info='NixOS'"
];
meta = with lib; {
description = "Widgets library for Xfce";
license = licenses.lgpl2Plus;

7
pkgs/desktops/xfce4-14/libxfce4util/default.nix
View File

@ -3,12 +3,11 @@
mkXfceDerivation rec {
category = "xfce";
pname = "libxfce4util";
version = "4.14pre2";
rev = "xfce-4.14pre2";
version = "4.14.0";
sha256 = "0s1fh798v86ifg46qn3zaykpwidn23vpqbkxq1fcbxpxb6rpxxwk";
sha256 = "0vq16bzmnykiikg4dhiaj0qbyj76nkdd54j6k6n568h3dc9ix6q4";
buildInputs = [ gobject-introspection ];
nativeBuildInputs = [ gobject-introspection ];
meta = with lib; {
description = "Extension library for Xfce";

4
pkgs/desktops/xfce4-14/mkXfceDerivation.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchgit, pkgconfig, xfce4-dev-tools, hicolor-icon-theme }:
{ stdenv, fetchgit, pkgconfig, xfce4-dev-tools, hicolor-icon-theme, wrapGAppsHook }:
{ category, pname, version, rev ? "${pname}-${version}", sha256, ... } @ args:
@ -15,7 +15,7 @@ let
template = rec {
name = "${pname}-${version}";
nativeBuildInputs = [ pkgconfig xfce4-dev-tools ];
nativeBuildInputs = [ pkgconfig xfce4-dev-tools wrapGAppsHook ];
buildInputs = [ hicolor-icon-theme ];
configureFlags = [ "--enable-maintainer-mode" ];

13
pkgs/desktops/xfce4-14/mousepad/default.nix
View File

@ -1,12 +1,15 @@
{ mkXfceDerivation, exo, wrapGAppsHook, dbus-glib, gtk3, gtksourceview3 }:
{ mkXfceDerivation, exo, glib, gtk3, gtksourceview3, xfconf }:
mkXfceDerivation rec {
category = "apps";
pname = "mousepad";
version = "0.4.1";
version = "0.4.2";
sha256 = "0pr1w9n0qq2raxhy78982i9g17x0ya02q7vdrn0wb2bpk74hlki5";
sha256 = "0a35vaq4l0d8vzw7hqpvbgkr3wj1sqr2zvj7bc5z4ikz2cppqj7p";
nativeBuildInputs = [ exo wrapGAppsHook ];
buildInputs = [ dbus-glib gtk3 gtksourceview3 ];
nativeBuildInputs = [ exo ];
buildInputs = [ glib gtk3 gtksourceview3 xfconf ];
# See https://github.com/NixOS/nixpkgs/issues/36468
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
}

2
pkgs/desktops/xfce4-14/orage/default.nix
View File

@ -1,5 +1,5 @@
{ lib, fetchpatch, mkXfceDerivation, dbus-glib, gtk2, libical, libnotify, tzdata
, popt, libxfce4ui ? null, xfce4-panel ? null, withPanelPlugin ? true }:
, popt, libxfce4ui, xfce4-panel, withPanelPlugin ? true }:
assert withPanelPlugin -> libxfce4ui != null && xfce4-panel != null;

14
pkgs/desktops/xfce4-14/parole/default.nix
View File

@ -1,24 +1,22 @@
{ mkXfceDerivation, makeWrapper, wrapGAppsHook, dbus, dbus-glib
, gst-plugins-bad ? null, gst-plugins-base, gst-plugins-good
, gst-plugins-ugly ? null, gtk3, libnotify, libxfce4ui, libxfce4util
, taglib ? null, xfconf }:
{ mkXfceDerivation, dbus, dbus-glib
, gst-plugins-bad, gst-plugins-base, gst-plugins-good
, gst-plugins-ugly, gtk3, libnotify, libxfce4ui, libxfce4util
, taglib, xfconf }:
# Doesn't seem to find H.264 codec even though built with gst-plugins-bad.
mkXfceDerivation rec {
category = "apps";
pname = "parole";
version = "1.0.2";
version = "1.0.4";
sha256 = "11i20pvbrcf1jbn77skb1cg72jdmdd0jvmf5khfn91slqky8gcbl";
sha256 = "18j4bmny37crryh4pvxcjjvj99mln6ljq2vy69awxhvrjx9ljv13";
postPatch = ''
substituteInPlace src/plugins/mpris2/Makefile.am \
--replace GST_BASE_CFLAGS GST_VIDEO_CFLAGS
'';
nativeBuildInputs = [ makeWrapper wrapGAppsHook ];
buildInputs = [
dbus
dbus-glib

15
pkgs/desktops/xfce4-14/ristretto/default.nix
View File

@ -1,18 +1,13 @@
{ mkXfceDerivation, automakeAddFlags, exo, dbus-glib, gtk2, libexif
{ mkXfceDerivation, automakeAddFlags, exo, gtk3, glib, libexif
, libxfce4ui, libxfce4util, xfconf }:
mkXfceDerivation rec {
category = "apps";
pname = "ristretto";
version = "0.8.4";
version = "0.10.0";
postPatch = ''
automakeAddFlags src/Makefile.am ristretto_CFLAGS DBUS_GLIB_CFLAGS
automakeAddFlags src/Makefile.am ristretto_LDADD DBUS_GLIB_LIBS
'';
sha256 = "07h7wbq3xh2ac6q4kp2ai1incfn0zfxxngap7hzqx47a5xw2mrm8";
nativeBuildInputs = [ automakeAddFlags exo ];
buildInputs = [ dbus-glib gtk2 libexif libxfce4ui libxfce4util xfconf ];
sha256 = "0vnivwl0xwhzpflys9zwds6x9gqd3v069qn04afmakhi2m8qr6hf";
nativeBuildInputs = [ exo ];
buildInputs = [ glib gtk3 libexif libxfce4ui libxfce4util xfconf ];
}

5
pkgs/desktops/xfce4-14/thunar-volman/default.nix
View File

@ -3,10 +3,9 @@
mkXfceDerivation rec {
category = "xfce";
pname = "thunar-volman";
version = "4.14pre2";
rev = "xfce-4.14pre2";
version = "0.9.5";
buildInputs = [ exo gtk3 libgudev libxfce4ui libxfce4util xfconf ];
sha256 = "0jl863z6rxz50vqa31s58dfn429yn5x8scg492bvgl4cnmni6a30";
sha256 = "1qrlpn0q5g9psd41l6y80r3bvbg8jaic92m6r400zzwcvivf95z0";
}

18
pkgs/desktops/xfce4-14/thunar/default.nix
View File

@ -1,21 +1,14 @@
{ mkXfceDerivation, docbook_xsl, exo, gdk-pixbuf, gtk3, libgudev ? null
, libnotify ? null, libX11, libxfce4ui, libxfce4util, libxslt, xfconf }:
{ mkXfceDerivation, docbook_xsl, exo, gdk-pixbuf, gtk3, libgudev
, libnotify, libX11, libxfce4ui, libxfce4util, libxslt, xfconf, gobject-introspection, gvfs }:
mkXfceDerivation rec {
category = "xfce";
pname = "thunar";
version = "4.14pre2";
rev = "xfce-4.14pre2";
version = "1.8.9";
sha256 = "0b17yf8ss8s8xyr65v4zrq15ayr5nskqpxy4wxah33n7lz09dh8r";
sha256 = "01w60csbs2nq1bhb8n1bnmjmx48fm0va3qbnq84z0h2dxpr80b1w";
postPatch = ''
substituteInPlace docs/Makefile.am \
--replace http://docbook.sourceforge.net/release/xsl/current \
${docbook_xsl}/share/xml/docbook-xsl
'';
nativeBuildInputs = [ libxslt ];
nativeBuildInputs = [ libxslt docbook_xsl gobject-introspection ];
buildInputs = [
exo
@ -27,5 +20,6 @@ mkXfceDerivation rec {
libxfce4ui
libxfce4util
xfconf
gvfs
];
}

27
pkgs/desktops/xfce4-14/tumbler/default.nix
View File

@ -1,15 +1,30 @@
{ mkXfceDerivation, gdk-pixbuf ? null, ffmpegthumbnailer ? null, libgsf ? null
, poppler ? null }:
{ mkXfceDerivation
, ffmpegthumbnailer
, gdk-pixbuf
, glib
, freetype
, libgsf
, poppler
, libjpeg
, gst_all_1
}:
# TODO: add libopenraw
mkXfceDerivation rec {
category = "xfce";
pname = "tumbler";
version = "4.14pre2";
rev = "xfce-4.14pre2";
version = "0.2.7";
sha256 = "1k579g8dmcfpw1vakspv6k2qkr1y1axyr8cbd0fqjhqdj4pis81i";
sha256 = "14ql3fcxyz81qr9s0vcwh6j2ks5fl8jf9scwnkilv5jy0ii9l0ry";
buildInputs = [ gdk-pixbuf ffmpegthumbnailer libgsf poppler ];
buildInputs = [
ffmpegthumbnailer
freetype
gdk-pixbuf
glib
gst_all_1.gst-plugins-base
libgsf
poppler # technically the glib binding
];
}

8
pkgs/desktops/xfce4-14/xfburn/default.nix
View File

@ -5,14 +5,8 @@ mkXfceDerivation rec {
pname = "xfburn";
version = "0.5.5";
postPatch = ''
substituteInPlace docs/Makefile.am \
--replace http://docbook.sourceforge.net/release/xsl/current \
${docbook_xsl}/share/xml/docbook-xsl
'';
sha256 = "1lmv48vqrlap1a2ha72g16vqly18zvcwj8y3f3f00l10pmn52bkp";
nativeBuildInputs = [ libxslt ];
nativeBuildInputs = [ libxslt docbook_xsl ];
buildInputs = [ exo gtk2 libburn libisofs libxfce4ui ];
}

5
pkgs/desktops/xfce4-14/xfce4-appfinder/default.nix
View File

@ -3,10 +3,9 @@
mkXfceDerivation rec {
category = "xfce";
pname = "xfce4-appfinder";
version = "4.14pre2";
rev = "xfce-4.14pre2";
version = "4.14.0";
sha256 = "0vr5lx4fv0kldqvqfnsjp6ss7ciz0b2yjq4fhmrhk8czkf8p7va8";
sha256 = "04h7jxfm3wkxnxfy8149dckay7i160vvk4p9lnq6xny22r4x20h8";
nativeBuildInputs = [ exo ];
buildInputs = [ garcon gtk3 libxfce4ui libxfce4util xfconf ];

5
pkgs/desktops/xfce4-14/xfce4-dev-tools/default.nix
View File

@ -4,10 +4,9 @@
mkXfceDerivation rec {
category = "xfce";
pname = "xfce4-dev-tools";
version = "4.14pre2";
rev = "xfce-4.14pre2";
version = "4.14.0";
sha256 = "11g5byxjihgkn0wi7gp8627d04wr59k117lpv53vdbsvv2qgksmg";
sha256 = "10hcj88784faqrk08xb538355cla26vdk9ckx158hqdqv38sb42f";
nativeBuildInputs = [ autoreconfHook ];

4
pkgs/desktops/xfce4-14/xfce4-notifyd/default.nix
View File

@ -1,4 +1,4 @@
{ mkXfceDerivation, dbus-glib, exo, gtk3, libnotify, libxfce4ui, libxfce4util
{ mkXfceDerivation, glib, exo, gtk3, libnotify, libxfce4ui, libxfce4util
, xfce4-panel, xfconf }:
mkXfceDerivation rec {
@ -8,5 +8,5 @@ mkXfceDerivation rec {
sha256 = "1lmm9h3ych8dz9jpjkxg91f9ln14xs527nxjxsryks00kmqk4kai";
buildInputs = [ dbus-glib exo gtk3 libnotify libxfce4ui libxfce4util xfce4-panel xfconf ];
buildInputs = [ exo gtk3 glib libnotify libxfce4ui libxfce4util xfce4-panel xfconf ];
}

20
pkgs/desktops/xfce4-14/xfce4-panel/default.nix
View File

@ -1,15 +1,14 @@
{ mkXfceDerivation, makeWrapper, tzdata, exo, garcon, gtk2, gtk3, gettext, glib-networking, libxfce4ui, libxfce4util, libwnck3, xfconf }:
{ mkXfceDerivation, tzdata, exo, garcon, gtk2, gtk3, glib, gettext, glib-networking, libxfce4ui, libxfce4util, libwnck3, xfconf, gobject-introspection }:
mkXfceDerivation rec {
category = "xfce";
pname = "xfce4-panel";
version = "4.14pre2";
rev = "xfce-4.14pre2";
version = "4.14.0";
sha256 = "1p0bkbxjh14kgny2lpcjg2q8pm55l8i7qsr5bsvdppw3ab46kz34";
sha256 = "1v3f2xjz9gwa8maqqvv9w2dh1cgy03v89a9ny7nrv0cjsxwwrr15";
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ exo garcon gtk2 gtk3 libxfce4ui libxfce4util libwnck3 xfconf ];
nativeBuildInputs = [ gobject-introspection ];
buildInputs = [ exo garcon gtk2 gtk3 glib glib-networking libxfce4ui libxfce4util libwnck3 xfconf ];
patches = [ ../../xfce/core/xfce4-panel-datadir.patch ];
patchFlags = "-p1";
@ -19,18 +18,11 @@ mkXfceDerivation rec {
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))" ""
--replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
'';
configureFlags = [ "--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"
'';
meta = {
description = "Xfce's panel";
};

5
pkgs/desktops/xfce4-14/xfce4-power-manager/default.nix
View File

@ -4,10 +4,9 @@
mkXfceDerivation rec {
category = "xfce";
pname = "xfce4-power-manager";
version = "4.14pre2";
rev = "xfce-4.14pre2";
version = "1.6.5";
sha256 = "1x1ssji4v9qp64si38paz15bgsgs1w3hkx080qznnmcxqlg7zpj9";
sha256 = "0zazm2cgkz5xj7rvy9gbh4kaay2anfcmawg4gj38pnq3a8zcwwd5";
nativeBuildInputs = [ automakeAddFlags exo ];
buildInputs = [ gtk3 libnotify libxfce4ui libxfce4util upower xfconf ];

3
pkgs/desktops/xfce4-14/xfce4-screenshooter/default.nix
View File

@ -1,4 +1,4 @@
{ mkXfceDerivation, exo, gtk3, libsoup, libxfce4ui, libxfce4util, xfce4-panel, wrapGAppsHook, glib-networking }:
{ mkXfceDerivation, exo, gtk3, libsoup, libxfce4ui, libxfce4util, xfce4-panel, glib-networking }:
mkXfceDerivation rec {
category = "apps";
@ -7,6 +7,5 @@ mkXfceDerivation rec {
sha256 = "1h14sywvk9l06p3z1cpb79911j8w2wqbk03ldknjkia2rfymjk06";
nativeBuildInputs = [ wrapGAppsHook ]; # fix "No GSettings schemas are installed on the system"
buildInputs = [ exo gtk3 libsoup libxfce4ui libxfce4util xfce4-panel glib-networking ];
}

22
pkgs/desktops/xfce4-14/xfce4-session/default.nix
View File

@ -1,26 +1,18 @@
{ mkXfceDerivation, polkit, exo, libxfce4util, libxfce4ui, xfconf, dbus-glib, dbus, iceauth, gtk3, libwnck3, xorg }:
{ mkXfceDerivation, polkit, exo, libxfce4util, libxfce4ui, xfconf, iceauth, gtk3, glib, libwnck3, xorg }:
mkXfceDerivation rec {
category = "xfce";
pname = "xfce4-session";
version = "4.14pre2";
rev = "xfce-4.14pre2";
version = "4.14.0";
sha256 = "1asfy11rp6zmn70a3w5dqssxpxywhpm9ns7zyiaz6pnpcq075dr0";
sha256 = "0v0xzkdr5rgv6219c1dy96cghgw8bqnb313jccxihfgddf363104";
buildInputs = [ exo dbus-glib dbus gtk3 libxfce4ui libxfce4util libwnck3 xfconf polkit iceauth ];
buildInputs = [ exo gtk3 glib libxfce4ui libxfce4util libwnck3 xfconf polkit iceauth ];
configureFlags = [ "--with-xsession-prefix=$(out)" ];
configureFlags = [ "--with-xsession-prefix=${placeholder ''out''}" ];
NIX_CFLAGS_COMPILE = [ "-I${dbus-glib.dev}/include/dbus-1.0"
"-I${dbus.dev}/include/dbus-1.0"
"-I${dbus.lib}/lib/dbus-1.0/include"
];
postPatch = ''
substituteInPlace configure.ac.in --replace gio-2.0 gio-unix-2.0
substituteInPlace scripts/xflock4 --replace PATH=/bin:/usr/bin "PATH=\$PATH:$out/bin:${xorg.xset}/bin"
'';
# See https://github.com/NixOS/nixpkgs/issues/36468
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
meta = {
description = "Session manager for Xfce";

17
pkgs/desktops/xfce4-14/xfce4-settings/default.nix
View File

@ -1,35 +1,32 @@
{ mkXfceDerivation, automakeAddFlags, exo, garcon, gtk3
, libnotify ? null, libxfce4ui, libxfce4util, libxklavier ? null
, upower ? null, xfconf, xf86inputlibinput ? null }:
{ mkXfceDerivation, automakeAddFlags, exo, garcon, gtk3, glib
, libnotify, libxfce4ui, libxfce4util, libxklavier
, upower, xfconf, xf86inputlibinput }:
mkXfceDerivation rec {
category = "xfce";
pname = "xfce4-settings";
version = "4.14pre2";
rev = "xfce-4.14pre2";
version = "4.14.0";
sha256 = "0agi5flbzbc9q29yh7wbk3giif74finf4shq3q7v2h91w5kvyc9j";
sha256 = "13gmxd4sfgd6wky7s03bar58w9vl4i6jv2wncd6iajww791y5akn";
postPatch = ''
automakeAddFlags xfce4-settings-editor/Makefile.am xfce4_settings_editor_CFLAGS DBUS_GLIB_CFLAGS
for f in $(find . -name \*.c); do
substituteInPlace $f --replace \"libinput-properties.h\" '<xorg/libinput-properties.h>'
done
'';
nativeBuildInputs = [ automakeAddFlags ];
buildInputs = [
exo
garcon
glib
gtk3
libnotify
libxfce4ui
libxfce4util
libxklavier
upower
xfconf
xf86inputlibinput
xfconf
];
configureFlags = [

9
pkgs/desktops/xfce4-14/xfce4-terminal/default.nix
View File

@ -1,14 +1,13 @@
{ mkXfceDerivation, gtk3, libxfce4ui, wrapGAppsHook, vte }:
{ mkXfceDerivation, gtk3, libxfce4ui, vte, xfconf }:
mkXfceDerivation rec {
category = "apps";
pname = "xfce4-terminal";
version = "0.8.7.4";
version = "0.8.8";
sha256 = "1s1dq560icg602jjb2ja58x7hxg4ikp3jrrf74v3qgi0ir950k2y";
sha256 = "0sg9vwyvhh7pjp83biv7gvf42423a7ly4dc7q2gn28kp6bds2qcp";
buildInputs = [ gtk3 libxfce4ui vte ];
nativeBuildInputs = [ wrapGAppsHook ];
buildInputs = [ gtk3 libxfce4ui vte xfconf ];
meta = {
description = "A modern terminal emulator";

2
pkgs/desktops/xfce4-14/xfce4-volumed-pulse/default.nix
View File

@ -1,4 +1,4 @@
{ lib, mkXfceDerivation, gtk3, libnotify ? null, libpulseaudio, keybinder3, xfconf }:
{ lib, mkXfceDerivation, gtk3, libnotify, libpulseaudio, keybinder3, xfconf }:
mkXfceDerivation rec {
category = "apps";

8
pkgs/desktops/xfce4-14/xfce4-whiskermenu-plugin/default.nix
View File

@ -1,15 +1,15 @@
{ mkXfceDerivation, dbus-glib, gtk3, cmake, exo, garcon, libxfce4ui, libxfce4util, xfce4-panel, xfconf }:
{ mkXfceDerivation, gtk3, glib, cmake, exo, garcon, libxfce4ui, libxfce4util, xfce4-panel, xfconf }:
mkXfceDerivation rec {
category = "panel-plugins";
pname = "xfce4-whiskermenu-plugin";
version = "2.3.2";
version = "2.3.3";
rev = "v${version}";
sha256 = "0ha6c259d7a0wzpf87ynyzpj3y178iwhpcb87m9zxm66i513qmbs";
sha256 = "0agh0a5srsy6vi6r50ak9rb42r7vcnfv6nfvg4qbqi77yc44yqdb";
nativeBuildInputs = [ cmake ];
buildInputs = [ dbus-glib exo garcon gtk3 libxfce4ui libxfce4util xfce4-panel xfconf ];
buildInputs = [ exo garcon gtk3 glib libxfce4ui libxfce4util xfce4-panel xfconf ];
postInstall = ''
substituteInPlace $out/bin/xfce4-popup-whiskermenu \

5
pkgs/desktops/xfce4-14/xfconf/default.nix
View File

@ -3,10 +3,9 @@
mkXfceDerivation rec {
category = "xfce";
pname = "xfconf";
version = "4.14pre2";
rev = "xfce-4.14pre2";
version = "4.14.1";
sha256 = "056r2dkkw8hahqin1p5k8rz0r9r0z8piniy855nd1ns0mx2sh47k";
sha256 = "1mbqc1463xgn7gafbh2fyshshdxin33iwk96y4nw2gl48nhx4sgs";
buildInputs = [ libxfce4util ];
}

12
pkgs/desktops/xfce4-14/xfdesktop/default.nix
View File

@ -1,14 +1,11 @@
{ mkXfceDerivation, exo, wrapGAppsHook, gtk3, libxfce4ui, libxfce4util, libwnck3, xfconf }:
{ mkXfceDerivation, exo, gtk3, libxfce4ui, libxfce4util, libwnck3, xfconf, libnotify, garcon, thunar }:
mkXfceDerivation rec {
category = "xfce";
pname = "xfdesktop";
version = "4.14pre2";
rev = "xfce-4.14pre2";
version = "4.14.1";
sha256 = "14sfcxbwxhhwn9nmiap46nz6idvw5hwr8wyjqrhq4h79x78g18k4";
nativeBuildInputs = [ wrapGAppsHook ]; # fix "No GSettings schemas are installed on the system"
sha256 = "006w4xwmpwp34q2qkkixr3xz0vb0kny79pw64yj4304wsb5jr14g";
buildInputs = [
exo
@ -17,6 +14,9 @@ mkXfceDerivation rec {
libxfce4util
libwnck3
xfconf
libnotify
garcon
thunar
];
meta = {

5
pkgs/desktops/xfce4-14/xfwm4/default.nix
View File

@ -5,10 +5,9 @@
mkXfceDerivation rec {
category = "xfce";
pname = "xfwm4";
version = "4.14pre2";
rev = "xfce-4.14pre2";
version = "4.14.0";
sha256 = "00nysv5qrv5n4xzyqv4jnsmgljwr2wyynis1gpdbm2kvl5ndxrrd";
sha256 = "1z5aqij2d8n9wnha88b0qzkvss54jvqs8w1w5m3mzjl4c9mn9n8m";
nativeBuildInputs = [ exo librsvg ];