mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 23:03:40 +01:00
Merge pull request #64147 from volth/xfce-4.14pre2
xfce4-13: 4.14pre1 -> 4.14pre2
This commit is contained in:
commit
202d2b97b9
16 changed files with 55 additions and 48 deletions
|
@ -4,15 +4,19 @@
|
|||
mkXfceDerivation rec {
|
||||
category = "xfce";
|
||||
pname = "exo";
|
||||
version = "4.14pre1";
|
||||
rev = "xfce-4.14pre1";
|
||||
version = "4.14pre2";
|
||||
rev = "xfce-4.14pre2";
|
||||
|
||||
sha256 = "1gf9fb48nkafb4jj0hmm2s00mpl32dp5iqxfaxm5i1nc6884hipw";
|
||||
sha256 = "0s91fv4yzafmdi25c63yin15sa25cfcyarpvavr4q3mmmiamzpi0";
|
||||
|
||||
nativeBuildInputs = [ libxslt perlPackages.URI ];
|
||||
buildInputs = [ gtk3 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
|
||||
|
|
|
@ -3,10 +3,10 @@
|
|||
mkXfceDerivation rec {
|
||||
category = "xfce";
|
||||
pname = "garcon";
|
||||
version = "4.14pre1";
|
||||
rev = "xfce-4.14pre1";
|
||||
version = "4.14pre2";
|
||||
rev = "xfce-4.14pre2";
|
||||
|
||||
sha256 = "0gmvi6m3iww7m3xxx5wiqd8vsi18igzhcpjfzknfc8z741vc38yj";
|
||||
sha256 = "0d2fir4vbfdmng9k70nf5zv3fjwgr6g0czrp458x6qswih2gv2ik";
|
||||
|
||||
buildInputs = [ gtk3 libxfce4ui libxfce4util ];
|
||||
}
|
||||
|
|
|
@ -4,10 +4,10 @@
|
|||
mkXfceDerivation rec {
|
||||
category = "xfce";
|
||||
pname = "libxfce4ui";
|
||||
version = "4.14pre1";
|
||||
rev = "xfce-4.14pre1";
|
||||
version = "4.14pre2";
|
||||
rev = "xfce-4.14pre2";
|
||||
|
||||
sha256 = "0z4sadqwp71b3qmxlbms26d8vnxd9cks84mr2f1qaiww6rp7v69y";
|
||||
sha256 = "0kvqzf91ygxxkcy4drjminby4c3c42c54a3if8jwx0zmgbml7l8q";
|
||||
|
||||
buildInputs = [ gobject-introspection gtk2 gtk3 libstartup_notification xfconf ];
|
||||
propagatedBuildInputs = [ libxfce4util libICE libSM ];
|
||||
|
|
|
@ -3,10 +3,10 @@
|
|||
mkXfceDerivation rec {
|
||||
category = "xfce";
|
||||
pname = "libxfce4util";
|
||||
version = "4.14pre1";
|
||||
rev = "xfce-4.14pre1";
|
||||
version = "4.14pre2";
|
||||
rev = "xfce-4.14pre2";
|
||||
|
||||
sha256 = "13cqv4b34rmr9h7nr9gmk3x2mi2y0v91xzwrwhikd1lmz9ir5lkf";
|
||||
sha256 = "0s1fh798v86ifg46qn3zaykpwidn23vpqbkxq1fcbxpxb6rpxxwk";
|
||||
|
||||
buildInputs = [ gobject-introspection ];
|
||||
|
||||
|
|
|
@ -3,10 +3,10 @@
|
|||
mkXfceDerivation rec {
|
||||
category = "xfce";
|
||||
pname = "thunar-volman";
|
||||
version = "4.14pre1";
|
||||
rev = "xfce-4.14pre1";
|
||||
version = "4.14pre2";
|
||||
rev = "xfce-4.14pre2";
|
||||
|
||||
buildInputs = [ exo gtk3 libgudev libxfce4ui libxfce4util xfconf ];
|
||||
|
||||
sha256 = "1g784yjhjacjnkhr8m62xyhnxlfbwk0fwb366p9kkz035k51idrv";
|
||||
sha256 = "0jl863z6rxz50vqa31s58dfn429yn5x8scg492bvgl4cnmni6a30";
|
||||
}
|
||||
|
|
|
@ -4,10 +4,10 @@
|
|||
mkXfceDerivation rec {
|
||||
category = "xfce";
|
||||
pname = "thunar";
|
||||
version = "4.14pre1";
|
||||
rev = "xfce-4.14pre1";
|
||||
version = "4.14pre2";
|
||||
rev = "xfce-4.14pre2";
|
||||
|
||||
sha256 = "13l1nw526jz80p0ynhxqd3a8flp561z0321z7h4rvnidicvdr32n";
|
||||
sha256 = "0b17yf8ss8s8xyr65v4zrq15ayr5nskqpxy4wxah33n7lz09dh8r";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace docs/Makefile.am \
|
||||
|
|
|
@ -6,10 +6,10 @@
|
|||
mkXfceDerivation rec {
|
||||
category = "xfce";
|
||||
pname = "tumbler";
|
||||
version = "4.14pre1";
|
||||
rev = "xfce-4.14pre1";
|
||||
version = "4.14pre2";
|
||||
rev = "xfce-4.14pre2";
|
||||
|
||||
sha256 = "1bvcxqs3391dkf36gpfr0hbylsk84nqhv6kf3lf1hq6p7s9f9z3z";
|
||||
sha256 = "1k579g8dmcfpw1vakspv6k2qkr1y1axyr8cbd0fqjhqdj4pis81i";
|
||||
|
||||
buildInputs = [ gdk_pixbuf ffmpegthumbnailer libgsf poppler ];
|
||||
}
|
||||
|
|
|
@ -3,10 +3,10 @@
|
|||
mkXfceDerivation rec {
|
||||
category = "xfce";
|
||||
pname = "xfce4-appfinder";
|
||||
version = "4.14pre1";
|
||||
rev = "xfce-4.14pre1";
|
||||
version = "4.14pre2";
|
||||
rev = "xfce-4.14pre2";
|
||||
|
||||
sha256 = "02ds3s7wbpxka7qnliq4c5p428ricdf0jwv01dkfg88gpgqgvswg";
|
||||
sha256 = "0vr5lx4fv0kldqvqfnsjp6ss7ciz0b2yjq4fhmrhk8czkf8p7va8";
|
||||
|
||||
nativeBuildInputs = [ exo ];
|
||||
buildInputs = [ garcon gtk3 libxfce4ui libxfce4util xfconf ];
|
||||
|
|
|
@ -4,9 +4,10 @@
|
|||
mkXfceDerivation rec {
|
||||
category = "xfce";
|
||||
pname = "xfce4-dev-tools";
|
||||
version = "4.12.0";
|
||||
version = "4.14pre2";
|
||||
rev = "xfce-4.14pre2";
|
||||
|
||||
sha256 = "0bbmlmw2dpm10q2wv3vy592i0vx7b5h1qnd35j0fdzxqb8x2hbw2";
|
||||
sha256 = "11g5byxjihgkn0wi7gp8627d04wr59k117lpv53vdbsvv2qgksmg";
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
|
|
|
@ -3,10 +3,10 @@
|
|||
mkXfceDerivation rec {
|
||||
category = "xfce";
|
||||
pname = "xfce4-panel";
|
||||
version = "4.14pre1";
|
||||
rev = "xfce-4.14pre1";
|
||||
version = "4.14pre2";
|
||||
rev = "xfce-4.14pre2";
|
||||
|
||||
sha256 = "03jyglimm4wgpmg5a128fshrygzwmpf5wdw26l9azqj8b6iz55al";
|
||||
sha256 = "1p0bkbxjh14kgny2lpcjg2q8pm55l8i7qsr5bsvdppw3ab46kz34";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ exo garcon gtk2 gtk3 libxfce4ui libxfce4util libwnck3 xfconf ];
|
||||
|
|
|
@ -4,10 +4,10 @@
|
|||
mkXfceDerivation rec {
|
||||
category = "xfce";
|
||||
pname = "xfce4-power-manager";
|
||||
version = "4.14pre1";
|
||||
rev = "xfce-4.14pre1";
|
||||
version = "4.14pre2";
|
||||
rev = "xfce-4.14pre2";
|
||||
|
||||
sha256 = "1n9i62jh5ldf8g9n64mm6nh1182abbf96444j14dppb82r94q077";
|
||||
sha256 = "1x1ssji4v9qp64si38paz15bgsgs1w3hkx080qznnmcxqlg7zpj9";
|
||||
|
||||
nativeBuildInputs = [ automakeAddFlags exo ];
|
||||
buildInputs = [ gtk3 libnotify libxfce4ui libxfce4util upower xfconf ];
|
||||
|
|
|
@ -3,10 +3,10 @@
|
|||
mkXfceDerivation rec {
|
||||
category = "xfce";
|
||||
pname = "xfce4-session";
|
||||
version = "4.14pre1";
|
||||
rev = "xfce-4.14pre1";
|
||||
version = "4.14pre2";
|
||||
rev = "xfce-4.14pre2";
|
||||
|
||||
sha256 = "14bn3wn5qrciy2nbhbx634bz0d6lnxb135bx1qglcf35wn6f0hqk";
|
||||
sha256 = "1asfy11rp6zmn70a3w5dqssxpxywhpm9ns7zyiaz6pnpcq075dr0";
|
||||
|
||||
buildInputs = [ exo dbus-glib dbus gtk3 libxfce4ui libxfce4util libwnck3 xfconf polkit iceauth ];
|
||||
|
||||
|
|
|
@ -5,10 +5,10 @@
|
|||
mkXfceDerivation rec {
|
||||
category = "xfce";
|
||||
pname = "xfce4-settings";
|
||||
version = "4.14pre1";
|
||||
rev = "xfce-4.14pre1";
|
||||
version = "4.14pre2";
|
||||
rev = "xfce-4.14pre2";
|
||||
|
||||
sha256 = "0q6jh3fqw9n9agp018xiwidrld445irnli5jgwpszi9hc435dbpc";
|
||||
sha256 = "0agi5flbzbc9q29yh7wbk3giif74finf4shq3q7v2h91w5kvyc9j";
|
||||
|
||||
postPatch = ''
|
||||
automakeAddFlags xfce4-settings-editor/Makefile.am xfce4_settings_editor_CFLAGS DBUS_GLIB_CFLAGS
|
||||
|
|
|
@ -3,10 +3,10 @@
|
|||
mkXfceDerivation rec {
|
||||
category = "xfce";
|
||||
pname = "xfconf";
|
||||
version = "4.14pre1";
|
||||
rev = "xfce-4.14pre1";
|
||||
version = "4.14pre2";
|
||||
rev = "xfce-4.14pre2";
|
||||
|
||||
sha256 = "0n9cjiz3mj011p3w4jv0n2ifz38whmykdl888mczc26l1gflxnr3";
|
||||
sha256 = "056r2dkkw8hahqin1p5k8rz0r9r0z8piniy855nd1ns0mx2sh47k";
|
||||
|
||||
buildInputs = [ libxfce4util ];
|
||||
}
|
||||
|
|
|
@ -1,12 +1,14 @@
|
|||
{ mkXfceDerivation, exo, gtk3, libxfce4ui, libxfce4util, libwnck3, xfconf }:
|
||||
{ mkXfceDerivation, exo, wrapGAppsHook, gtk3, libxfce4ui, libxfce4util, libwnck3, xfconf }:
|
||||
|
||||
mkXfceDerivation rec {
|
||||
category = "xfce";
|
||||
pname = "xfdesktop";
|
||||
version = "4.14pre1";
|
||||
rev = "xfce-4.14pre1";
|
||||
version = "4.14pre2";
|
||||
rev = "xfce-4.14pre2";
|
||||
|
||||
sha256 = "1mni8gzgglhwicaw093i2vpk8q2vilmgg5qbr3izbb8ighhr09jl";
|
||||
sha256 = "14sfcxbwxhhwn9nmiap46nz6idvw5hwr8wyjqrhq4h79x78g18k4";
|
||||
|
||||
nativeBuildInputs = [ wrapGAppsHook ]; # fix "No GSettings schemas are installed on the system"
|
||||
|
||||
buildInputs = [
|
||||
exo
|
||||
|
|
|
@ -5,10 +5,10 @@
|
|||
mkXfceDerivation rec {
|
||||
category = "xfce";
|
||||
pname = "xfwm4";
|
||||
version = "4.14pre1";
|
||||
rev = "xfce-4.14pre1";
|
||||
version = "4.14pre2";
|
||||
rev = "xfce-4.14pre2";
|
||||
|
||||
sha256 = "0kdlkpb7phcrsqhyhnw82f03fzmd5xb4w9fdj94frfprfja0b468";
|
||||
sha256 = "00nysv5qrv5n4xzyqv4jnsmgljwr2wyynis1gpdbm2kvl5ndxrrd";
|
||||
|
||||
nativeBuildInputs = [ exo librsvg ];
|
||||
|
||||
|
|
Loading…
Reference in a new issue