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

xfce: 4.10 -> 4.12 (close #6610)

Browse Source
This commit is contained in:
Domen Kožar 2015-03-12 22:46:47 +01:00 committed by Vladimír Čunát
parent b40eee79a7
commit 9567ba4601
19 changed files with 63 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/desktops/xfce/core/exo.nix
View File

@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
p_name = "exo";
ver_maj = "0.10";
ver_min = "2";
ver_min = "3";
src = fetchurl {
url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "1kknxiz703q4snmry65ajm26jwjslbgpzdal6bd090m3z25q51dk";
sha256 = "1g9651ra395v2fmzb943l68b9pg0rfxc19x97a62crchxwa4nw4m";
};
name = "${p_name}-${ver_maj}.${ver_min}";
@ -19,5 +19,6 @@ stdenv.mkDerivation rec {
homepage = "http://www.xfce.org/projects/${p_name}";
description = "Application library for the Xfce desktop environment";
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.linux;
};
}

11
pkgs/desktops/xfce/core/garcon.nix
View File

@ -1,21 +1,22 @@
{ stdenv, fetchurl, pkgconfig, intltool, glib, libxfce4util }:
{ stdenv, fetchurl, pkgconfig, intltool, glib, libxfce4util, libxfce4ui, gtk }:
stdenv.mkDerivation rec {
p_name = "garcon";
ver_maj = "0.2";
ver_min = "1";
ver_maj = "0.4";
ver_min = "0";
src = fetchurl {
url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "1xq14wayk07cil04yhrdkjhacz9dbldcl9i59sbrgrgznaw49dj8";
sha256 = "0wm9pjbwq53s3n3nwvsyf0q8lbmhiy2ln3bn5ncihr9vf5cwhzbq";
};
name = "${p_name}-${ver_maj}.${ver_min}";
buildInputs = [ pkgconfig intltool glib libxfce4util ];
buildInputs = [ pkgconfig intltool glib libxfce4util gtk libxfce4ui ];
meta = {
homepage = http://www.xfce.org/;
description = "Xfce menu support library";
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.linux;
};
}

11
pkgs/desktops/xfce/core/gtk-xfce-engine.nix
View File

@ -1,18 +1,17 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk, enableGtk3Support ? false, gtk3 }:
{ stdenv, fetchurl, pkgconfig, intltool, gtk }:
stdenv.mkDerivation rec {
p_name = "gtk-xfce-engine";
ver_maj = "3.0";
ver_min = "1";
ver_maj = "2.10";
ver_min = "0";
src = fetchurl {
url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "0vd0ly81540f9133abza56mlqqx1swp0j70ll8kf948sva0wy0zb";
sha256 = "0rqrnjxx1lzla7wp2fadyixs6jy0js6xh005pgwyqbigpl0v7hy1";
};
name = "${p_name}-${ver_maj}.${ver_min}";
#TODO: gtk3
buildInputs = [ pkgconfig intltool gtk ] ++ stdenv.lib.optional enableGtk3Support gtk3;
buildInputs = [ pkgconfig intltool gtk ];
meta = {
homepage = http://www.xfce.org/;

5
pkgs/desktops/xfce/core/libxfce4ui.nix
View File

@ -3,12 +3,12 @@
stdenv.mkDerivation rec {
p_name = "libxfce4ui";
ver_maj = "4.10";
ver_maj = "4.12";
ver_min = "0";
src = fetchurl {
url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "1qm31s6568cz4c8rl9fsfq0xmf7pldxm0ki62gx1cpybihlgmfd2";
sha256 = "11rrhqxnfwx5jls3nlg9s2x8saag9f2zqk9cdm6hr3bs6cr9a781";
};
name = "${p_name}-${ver_maj}.${ver_min}";
@ -32,5 +32,6 @@ stdenv.mkDerivation rec {
homepage = http://www.xfce.org/;
description = "Basic GUI library for Xfce";
license = stdenv.lib.licenses.lgpl2Plus;
platforms = stdenv.lib.platforms.linux;
};
}

5
pkgs/desktops/xfce/core/libxfce4util.nix
View File

@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
p_name = "libxfce4util";
ver_maj = "4.10";
ver_maj = "4.12";
ver_min = "1";
src = fetchurl {
url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "1fygyq9dywa989z1vb3d8hj4fg5ai75lcrngnf2s60jwf6nx2b78";
sha256 = "07c8r3xwx5is298zk77m3r784gmr5y4mh8bbca5zdjqk5vxdwsw7";
};
name = "${p_name}-${ver_maj}.${ver_min}";
@ -17,5 +17,6 @@ stdenv.mkDerivation rec {
homepage = http://www.xfce.org/;
description = "Basic utility non-GUI functions for Xfce";
license = "bsd";
platforms = stdenv.lib.platforms.linux;
};
}

7
pkgs/desktops/xfce/core/thunar-volman.nix
View File

@ -4,13 +4,14 @@
stdenv.mkDerivation rec {
p_name = "thunar-volman";
ver_maj = "0.8";
ver_min = "0";
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 = "1sxw09fwyn5sr6ipxk7r8gqjyf41c2v7vkgl0l6mhy5mcb48f27z";
sha256 = "1gf259n1v3y23n1zlkhyr6r0i8j59rnl1cmxvxj6la9cwdfbn22s";
};
name = "${p_name}-${ver_maj}.${ver_min}";
buildInputs =
[ pkgconfig intltool exo gtk udev libxfce4ui libxfce4util

4
pkgs/desktops/xfce/core/thunar.nix
View File

@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
p_name = "thunar";
ver_maj = "1.6";
ver_min = "3";
ver_min = "6";
src = fetchurl {
url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/Thunar-${ver_maj}.${ver_min}.tar.bz2";
sha256 = "17api7nc3h93k2mzrfmw6ygc0fqmg78ja0qbkzd9rhhsi3v0c9ws";
sha256 = "1cl9v3rdzipyyxml3pyrzspxfmmssz5h5snpj18irq4an42539dr";
};
name = "${p_name}-${ver_maj}.${ver_min}";

4
pkgs/desktops/xfce/core/tumbler.nix
View File

@ -4,11 +4,11 @@ libgsf, poppler, bzip2 }:
stdenv.mkDerivation rec {
p_name = "tumbler";
ver_maj = "0.1";
ver_min = "30";
ver_min = "31";
src = fetchurl {
url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "013kacqyy1vya7kp6jgc1almp3cbbvq96a3r7f5myiihr1whvhp7";
sha256 = "0wvip28gm2w061hn84zp2q4dv947ihylrppahn4cjspzff935zfh";
};
name = "${p_name}-${ver_maj}.${ver_min}";

6
pkgs/desktops/xfce/core/xfce4-appfinder.nix
View File

@ -3,12 +3,12 @@
stdenv.mkDerivation rec {
p_name = "xfce4-appfinder";
ver_maj = "4.10";
ver_min = "1";
ver_maj = "4.12";
ver_min = "0";
src = fetchurl {
url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "0xzbi1vvy724s7vljf4153h7s7zqqwg51bn9wirx4d33lzzp9vk5";
sha256 = "0ry5hin8xhgnkmm9vs7jq8blk1cnbyr0s18nm1j6nsm7360abm1a";
};
name = "${p_name}-${ver_maj}.${ver_min}";

4
pkgs/desktops/xfce/core/xfce4-dev-tools.nix
View File

@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
p_name = "xfce4-dev-tools";
ver_maj = "4.10";
ver_maj = "4.12";
ver_min = "0";
src = fetchurl {
url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "1y1byfjciqhxqfxbjfp22bn5lxk3a01ng7zfjha8h5mzzfxlk5pp";
sha256 = "1jxmyp80pwbfgmqmwpjxs7z5dmm6pyf3qj62z20xy44izraadqz2";
};
name = "${p_name}-${ver_maj}.${ver_min}";

6
pkgs/desktops/xfce/core/xfce4-panel.nix
View File

@ -4,12 +4,12 @@
stdenv.mkDerivation rec {
p_name = "xfce4-panel";
ver_maj = "4.10";
ver_min = "1";
ver_maj = "4.12";
ver_min = "0";
src = fetchurl {
url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "1mkmhhmy70izja6d6di65hay9ybqi8615pwjbx0lgqk53gnm4c2p";
sha256 = "1c4p3ckghvsad1sj5v8wmar5mh9cbhail9mmhad2f9pwwb10z4ih";
};
name = "${p_name}-${ver_maj}.${ver_min}";

6
pkgs/desktops/xfce/core/xfce4-power-manager.nix
View File

@ -3,12 +3,12 @@
stdenv.mkDerivation rec {
p_name = "xfce4-power-manager";
ver_maj = "1.3";
ver_min = "2";
ver_maj = "1.4";
ver_min = "3";
src = fetchurl {
url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "0lv29ycws185qr89xn01vcddkvpddk7q6hni0s6d0nqvjavycg0j";
sha256 = "04909sfc2nrj2wg9cw6y9y2r9yrp3l3vc201sy1gaiap67fi33h1";
};
name = "${p_name}-${ver_maj}.${ver_min}";

14
pkgs/desktops/xfce/core/xfce4-session.nix
View File

@ -6,23 +6,15 @@
stdenv.mkDerivation rec {
p_name = "xfce4-session";
ver_maj = "4.10";
ver_min = "1";
ver_maj = "4.12";
ver_min = "0";
src = fetchurl {
url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "10zwki7v55a325abr57wczcb5g7ml99cqk1p8ls8qycqqfyzlm01";
sha256 = "01kvbd09c06j20n155hracsgrq06rlmfgdywffjsvlwpn19m9j38";
};
name = "${p_name}-${ver_maj}.${ver_min}";
patches = [(fetchpatch {
name = "suspend+hibernate-via-logind.patch";
url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/"
+ "xfce4-session-4.10.1-logind-support-for-suspend-hibernate.patch"
+ "?h=packages/xfce4-session&id=f84637fa2b";
sha256 = "1pnm1w9invyxjdbfm7p0brf9krl9jy8ab2ilwvizymp5i0vnj0xc";
})];
buildInputs =
[ pkgconfig intltool gtk libxfce4util libxfce4ui libwnck dbus_glib
xfconf xfce4panel libglade xorg.iceauth

9
pkgs/desktops/xfce/core/xfce4-settings-default-icon-theme.patch
View File

@ -1,12 +1,11 @@
diff -ru -x '*~' xfce4-settings-4.10.1/xfsettingsd/xsettings.xml xfce4-settings-4.10.1-new/xfsettingsd/xsettings.xml
--- xfce4-settings-4.10.1/xfsettingsd/xsettings.xml 2013-05-05 18:12:54.000000000 +0200
+++ xfce4-settings-4.10.1-new/xfsettingsd/xsettings.xml 2013-08-15 15:57:48.538586286 +0200
--- 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="250"/>
<property name="DoubleClickTime" type="int" value="400"/>
<property name="DoubleClickDistance" type="int" value="5"/>
<property name="DndDragThreshold" type="int" value="8"/>
<property name="DndDragThreshold" type="int" value="8"/>

12
pkgs/desktops/xfce/core/xfce4-settings.nix
View File

@ -1,15 +1,15 @@
{ stdenv, fetchurl, pkgconfig, intltool, exo, gtk, libxfce4util, libxfce4ui
, libglade, xfconf, xorg, libwnck, libnotify, libxklavier, garcon }:
, libglade, xfconf, xorg, libwnck, libnotify, libxklavier, garcon, upower }:
#TODO: optional packages
stdenv.mkDerivation rec {
p_name = "xfce4-settings";
ver_maj = "4.10";
ver_min = "1";
ver_maj = "4.12";
ver_min = "0";
src = fetchurl {
url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "1m8k9s7qihwkkbjrrkmk103a6iwahxdfq65aswrsbqshx9cnk2hi";
sha256 = "108za1cmjslwzkdl76x9kwxkq8z734kg9nz8rxk057f10pqwxgh4";
};
name = "${p_name}-${ver_maj}.${ver_min}";
@ -17,10 +17,8 @@ stdenv.mkDerivation rec {
patches = [ ./xfce4-settings-default-icon-theme.patch ];
buildInputs =
[ pkgconfig intltool exo gtk libxfce4util libxfce4ui libglade
[ pkgconfig intltool exo gtk libxfce4util libxfce4ui libglade upower
xfconf xorg.libXi xorg.libXcursor libwnck libnotify libxklavier garcon
#gtk libxfce4util libxfcegui4 libwnck dbus_glib
#xfconf libglade xorg.iceauth
];
configureFlags = "--enable-pluggable-dialogs --enable-sound-settings";

5
pkgs/desktops/xfce/core/xfconf.nix
View File

@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
p_name = "xfconf";
ver_maj = "4.10";
ver_maj = "4.12";
ver_min = "0";
src = fetchurl {
url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "0xh520z0qh0ib0ijgnyrgii9h5d4pc53n6mx1chhyzfc86j1jlhp";
sha256 = "0mmi0g30aln3x98y5p507g17pipq0dj0bwypshan8cq5hkmfl44r";
};
name = "${p_name}-${ver_maj}.${ver_min}";
@ -19,5 +19,6 @@ stdenv.mkDerivation rec {
homepage = http://docs.xfce.org/xfce/xfconf/start;
description = "Simple client-server configuration storage and query system for Xfce";
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.linux;
};
}

6
pkgs/desktops/xfce/core/xfdesktop.nix
View File

@ -3,12 +3,12 @@
stdenv.mkDerivation rec {
p_name = "xfdesktop";
ver_maj = "4.10";
ver_min = "3";
ver_maj = "4.12";
ver_min = "0";
src = fetchurl {
url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "1kkj6axcbj82v3n2hkzsdranpqrxaarnyjxkpfs29dyqajjjpjh9";
sha256 = "1ivzgg4792nid6wcgd1nq5vc3z0y5ip6ymq7ci5j2qkp663qnykf";
};
name = "${p_name}-${ver_maj}.${ver_min}";

7
pkgs/desktops/xfce/core/xfwm4.nix
View File

@ -3,16 +3,15 @@
stdenv.mkDerivation rec {
p_name = "xfwm4";
ver_maj = "4.10";
ver_min = "1";
ver_maj = "4.12";
ver_min = "0";
src = fetchurl {
url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "0h57gwjs3j5f8ly0gmhl620338fg4qvlzs8gpqs9wxzblvxl831q";
sha256 = "0fnc2ps4k733n9qfpxrz047h1myyqjzxczl7fmkjmqwshvicpx19";
};
name = "${p_name}-${ver_maj}.${ver_min}";
#TODO: kde systray, docs
buildInputs =
[ pkgconfig intltool gtk libglade libxfce4util libxfce4ui xfconf
libwnck libstartup_notification

4
pkgs/desktops/xfce/default.nix
View File

@ -1,4 +1,6 @@
{ config, pkgs, newScope }: let
{ config, pkgs, newScope }:
let
callPackage = newScope (deps // xfce_self);