swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 12:59:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

xfce core: split into outputs, change style

Browse source 
- The split was only done where it seemed that some parts aren't really
  needed, which were mainly headers and gtk-doc.
- Update style to be closer with what's common in nixpkgs.
- Change explicit removal of icon theme cache into including the
  hicolor theme.
This commit is contained in:
Vladimír Čunát 2015-10-14 13:23:37 +02:00
parent 2490848627
commit 04c7506f0f
15 changed files with 161 additions and 127 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/desktops/xfce/core/exo.nix
View file

@ -1,4 +1,5 @@
{ stdenv, fetchurl, pkgconfig, intltool, URI, glib, gtk, libxfce4ui, libxfce4util }:
{ stdenv, fetchurl, pkgconfig, intltool, URI, glib, gtk, libxfce4ui, libxfce4util
, hicolor_icon_theme }:
stdenv.mkDerivation rec {
p_name = "exo";
@ -11,9 +12,11 @@ stdenv.mkDerivation rec {
};
name = "${p_name}-${ver_maj}.${ver_min}";
buildInputs = [ pkgconfig intltool URI glib gtk libxfce4ui libxfce4util ];
outputs = [ "dev" "out" "doc" ]; # dev-doc only
# lib/xfce4/exo-1/exo-compose-mail-1 is a perl script :-/
preFixup = "rm $out/share/icons/hicolor/icon-theme.cache";
nativeBuildInputs = [ pkgconfig intltool ];
buildInputs = [ URI glib gtk libxfce4ui libxfce4util hicolor_icon_theme ];
meta = with stdenv.lib; {
homepage = "http://www.xfce.org/projects/${p_name}";

16
pkgs/desktops/xfce/core/garcon.nix
View file

@ -1,22 +1,26 @@
{ stdenv, fetchurl, pkgconfig, intltool, glib, libxfce4util, libxfce4ui, gtk }:
stdenv.mkDerivation rec {
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";
};
name = "${p_name}-${ver_maj}.${ver_min}";
outputs = [ "dev" "out" "doc" ];
buildInputs = [ pkgconfig intltool glib libxfce4util gtk libxfce4ui ];
meta = {
meta = with stdenv.lib; {
homepage = http://www.xfce.org/;
description = "Xfce menu support library";
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.linux;
license = licenses.gpl2Plus;
platforms = platforms.linux;
};
}

31
pkgs/desktops/xfce/core/libxfce4ui.nix
View file

@ -1,37 +1,38 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, xfconf
, libglade, libstartup_notification }:
stdenv.mkDerivation rec {
, libglade, libstartup_notification, hicolor_icon_theme }:
let
p_name = "libxfce4ui";
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 = "3d619811bfbe7478bb984c16543d980cadd08586365a7bc25e59e3ca6384ff43";
};
name = "${p_name}-${ver_maj}.${ver_min}";
#TODO: gladeui
# Install into our own prefix instead.
preConfigure =
''
configureFlags="--with-libglade-module-path=$out/lib/libglade/2.0"
'';
outputs = [ "dev" "out" "doc" ]; # dev-doc only
buildInputs =
[ pkgconfig intltool gtk libxfce4util xfconf libglade
libstartup_notification
libstartup_notification hicolor_icon_theme
];
preFixup = "rm $out/share/icons/hicolor/icon-theme.cache";
#TODO: gladeui
# Install into our own prefix instead.
configureFlags = [
"--with-libglade-module-path=$(out)/lib/libglade/2.0"
];
enableParallelBuilding = true;
meta = {
meta = with stdenv.lib; {
homepage = http://www.xfce.org/;
description = "Basic GUI library for Xfce";
license = stdenv.lib.licenses.lgpl2Plus;
platforms = stdenv.lib.platforms.linux;
license = licenses.lgpl2Plus;
platforms = platforms.linux;
};
}

10
pkgs/desktops/xfce/core/libxfce4util.nix
View file

@ -1,15 +1,18 @@
{ stdenv, fetchurl, pkgconfig, glib, intltool }:
stdenv.mkDerivation rec {
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";
};
name = "${p_name}-${ver_maj}.${ver_min}";
outputs = [ "dev" "out" "doc" ]; # just dev-doc
buildInputs = [ pkgconfig glib intltool ];
@ -20,3 +23,4 @@ stdenv.mkDerivation rec {
platforms = stdenv.lib.platforms.linux;
};
}

21
pkgs/desktops/xfce/core/libxfcegui4.nix
View file

@ -1,31 +1,32 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk
, libxfce4util, xfconf, libglade, libstartup_notification }:
stdenv.mkDerivation rec {
, 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";
};
name = "${p_name}-${ver_maj}.${ver_min}";
outputs = [ "dev" "out" "doc" ]; # dev-doc only
#TODO: gladeui
# By default, libxfcegui4 tries to install into libglade's prefix.
# Install into our own prefix instead.
preConfigure =
''
configureFlags="--with-libglade-module-path=$out/lib/libglade/2.0"
'';
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
libstartup_notification hicolor_icon_theme
];
preFixup = "rm $out/share/icons/hicolor/icon-theme.cache";
meta = {
homepage = http://www.xfce.org/;

28
pkgs/desktops/xfce/core/tumbler.nix
View file

@ -1,19 +1,24 @@
{ stdenv, fetchurl, pkgconfig, intltool, dbus_glib, gdk_pixbuf, curl, freetype,
libgsf, poppler, bzip2 }:
stdenv.mkDerivation rec {
{ 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";
};
name = "${p_name}-${ver_maj}.${ver_min}";
buildInputs = [ pkgconfig intltool dbus_glib gdk_pixbuf curl freetype
poppler libgsf bzip2];
outputs = [ "dev" "out" "doc" ]; # dev-doc only
buildInputs = [
pkgconfig intltool dbus_glib gdk_pixbuf curl freetype
poppler libgsf bzip2
];
configureFlags = [
# Needs gst-tag
@ -21,15 +26,16 @@ stdenv.mkDerivation rec {
# Needs libffmpegthumbnailer
# "--enable-ffmpeg-thumbnailer"
"--enable-odf-thumbnailer"
"--enable-poppler-thumbnailer"
];
meta = {
meta = with stdenv.lib; {
homepage = http://git.xfce.org/xfce/tumbler/;
description = "A D-Bus thumbnailer service";
platforms = stdenv.lib.platforms.linux;
license = stdenv.lib.licenses.gpl2;
platforms = platforms.linux;
license = licenses.gpl2;
};
}

16
pkgs/desktops/xfce/core/xfce4-appfinder.nix
View file

@ -1,27 +1,29 @@
{ stdenv, fetchurl, pkgconfig, intltool, glib, gtk, libxfce4util
, libxfce4ui, garcon, xfconf }:
stdenv.mkDerivation rec {
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";
};
name = "${p_name}-${ver_maj}.${ver_min}";
buildInputs =
[ pkgconfig intltool glib gtk libxfce4util libxfce4ui garcon xfconf ];
enableParallelBuilding = true;
meta = {
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 = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.eelco ];
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = [ maintainers.eelco ];
};
}

8
pkgs/desktops/xfce/core/xfce4-dev-tools.nix
View file

@ -1,15 +1,16 @@
{ stdenv, fetchurl, pkgconfig, glib, autoconf, automake, libtool, intltool }:
stdenv.mkDerivation rec {
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";
};
name = "${p_name}-${ver_maj}.${ver_min}";
buildInputs = [ pkgconfig glib ];
@ -22,3 +23,4 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.gpl2Plus;
};
}

25
pkgs/desktops/xfce/core/xfce4-panel.nix
View file

@ -1,24 +1,28 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfce4ui
, libwnck, exo, garcon, xfconf, libstartup_notification
, makeWrapper, xfce4mixer }:
stdenv.mkDerivation rec {
, makeWrapper, xfce4mixer, hicolor_icon_theme
}:
let
p_name = "xfce4-panel";
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 = "1c4p3ckghvsad1sj5v8wmar5mh9cbhail9mmhad2f9pwwb10z4ih";
};
name = "${p_name}-${ver_maj}.${ver_min}";
patches = [ ./xfce4-panel-datadir.patch ];
patchFlags = "-p1";
outputs = [ "dev" "out" "doc" ]; # just dev-doc
buildInputs =
[ pkgconfig intltool gtk libxfce4util exo libwnck
garcon xfconf libstartup_notification makeWrapper
garcon xfconf libstartup_notification makeWrapper hicolor_icon_theme
] ++ xfce4mixer.gst_plugins;
propagatedBuildInputs = [ libxfce4ui ];
@ -27,15 +31,14 @@ stdenv.mkDerivation rec {
--prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH"
'';
preFixup = "rm $out/share/icons/hicolor/icon-theme.cache";
enableParallelBuilding = true;
meta = {
meta = with stdenv.lib; {
homepage = http://www.xfce.org/projects/xfce4-panel;
description = "Xfce panel";
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.eelco ];
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = [ maintainers.eelco ];
};
}

22
pkgs/desktops/xfce/core/xfce4-power-manager.nix
View file

@ -1,29 +1,29 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk, dbus_glib, upower, xfconf
, libxfce4ui, libxfce4util, libnotify, xfce4panel }:
stdenv.mkDerivation rec {
, libxfce4ui, libxfce4util, libnotify, xfce4panel, hicolor_icon_theme }:
let
p_name = "xfce4-power-manager";
ver_maj = "1.4";
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 = "01rvqy1cif4s8lkidb7hhmsz7d9f2fwcwvc51xycaj3qgsmch3n5";
};
name = "${p_name}-${ver_maj}.${ver_min}";
buildInputs =
[ pkgconfig intltool gtk dbus_glib upower xfconf libxfce4ui libxfce4util
libnotify xfce4panel
libnotify xfce4panel hicolor_icon_theme
];
preFixup = "rm $out/share/icons/hicolor/icon-theme.cache";
meta = {
meta = with stdenv.lib; {
homepage = http://goodies.xfce.org/projects/applications/xfce4-power-manager;
description = "A power manager for the Xfce Desktop Environment";
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.eelco ];
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = [ maintainers.eelco ];
};
}

26
pkgs/desktops/xfce/core/xfce4-session.nix
View file

@ -1,25 +1,26 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, gtk, polkit
, libxfce4util, libxfce4ui, xfce4panel, libwnck, dbus_glib, xfconf, libglade, xorg
, hicolor_icon_theme
}:
#TODO: gnome stuff: gconf (assistive?), keyring
stdenv.mkDerivation rec {
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";
};
name = "${p_name}-${ver_maj}.${ver_min}";
buildInputs =
[ pkgconfig intltool gtk libxfce4util libxfce4ui libwnck dbus_glib
xfconf xfce4panel libglade xorg.iceauth
polkit
];
xfconf xfce4panel libglade xorg.iceauth xorg.libSM
polkit hicolor_icon_theme
]; #TODO: upower-glib, gconf (assistive?), gnome keyring
preBuild = ''
sed '/^PATH=/d' -i scripts/xflock4
@ -28,13 +29,12 @@ stdenv.mkDerivation rec {
configureFlags = [ "--with-xsession-prefix=$(out)" ];
preFixup = "rm $out/share/icons/hicolor/icon-theme.cache";
meta = {
meta = with stdenv.lib; {
homepage = http://www.xfce.org/projects/xfce4-session;
description = "Session manager for Xfce";
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.eelco ];
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = [ maintainers.eelco ];
};
}

22
pkgs/desktops/xfce/core/xfce4-settings.nix
View file

@ -1,33 +1,33 @@
{ stdenv, fetchurl, pkgconfig, intltool, exo, gtk, libxfce4util, libxfce4ui
, libglade, xfconf, xorg, libwnck, libnotify, libxklavier, garcon, upower }:
#TODO: optional packages
stdenv.mkDerivation rec {
let
p_name = "xfce4-settings";
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 = "108za1cmjslwzkdl76x9kwxkq8z734kg9nz8rxk057f10pqwxgh4";
};
name = "${p_name}-${ver_maj}.${ver_min}";
patches = [ ./xfce4-settings-default-icon-theme.patch ];
buildInputs =
[ pkgconfig intltool exo gtk libxfce4util libxfce4ui libglade upower
xfconf xorg.libXi xorg.libXcursor libwnck libnotify libxklavier garcon
];
]; #TODO: optional packages
configureFlags = "--enable-pluggable-dialogs --enable-sound-settings";
configureFlags = [ "--enable-pluggable-dialogs" "--enable-sound-settings" ];
meta = {
meta = with stdenv.lib; {
homepage = http://www.xfce.org/projects/xfce4-settings;
description = "Settings manager for Xfce";
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.eelco ];
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = [ maintainers.eelco ];
};
}

16
pkgs/desktops/xfce/core/xfconf.nix
View file

@ -1,24 +1,28 @@
{ stdenv, fetchurl, pkgconfig, intltool, glib, libxfce4util, dbus_glib }:
stdenv.mkDerivation rec {
let
p_name = "xfconf";
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 = "0mmi0g30aln3x98y5p507g17pipq0dj0bwypshan8cq5hkmfl44r";
};
name = "${p_name}-${ver_maj}.${ver_min}";
outputs = [ "dev" "out" "doc" ]; # TODO: dev-doc only
#TODO: no perl bingings yet (ExtUtils::Depends, ExtUtils::PkgConfig, Glib)
buildInputs = [ pkgconfig intltool glib libxfce4util ];
propagatedBuildInputs = [ dbus_glib ];
meta = {
meta = with stdenv.lib; {
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;
license = licenses.gpl2;
platforms = platforms.linux;
};
}

22
pkgs/desktops/xfce/core/xfdesktop.nix
View file

@ -1,30 +1,32 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfce4ui
, libwnck, xfconf, libglade, xfce4panel, thunar, exo, garcon, libnotify }:
stdenv.mkDerivation rec {
, libwnck, xfconf, libglade, xfce4panel, 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";
};
name = "${p_name}-${ver_maj}.${ver_min}";
buildInputs =
[ pkgconfig intltool gtk libxfce4util libxfce4ui libwnck xfconf
libglade xfce4panel thunar exo garcon libnotify
libglade xfce4panel thunar exo garcon libnotify hicolor_icon_theme
];
preFixup = "rm $out/share/icons/hicolor/icon-theme.cache";
enableParallelBuilding = true;
meta = {
meta = with stdenv.lib; {
homepage = http://www.xfce.org/projects/xfdesktop;
description = "Xfce desktop manager";
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.eelco ];
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = [ maintainers.eelco ];
};
}

16
pkgs/desktops/xfce/core/xfwm4.nix
View file

@ -1,16 +1,17 @@
{ stdenv, fetchurl, pkgconfig, gtk, intltool, libglade, libxfce4util
, libxfce4ui, xfconf, libwnck, libstartup_notification, xorg }:
stdenv.mkDerivation rec {
let
p_name = "xfwm4";
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 = "f4a988fbc4e0df7e8583c781d271559e56fd28696092f94ae052e9e6edb09eac";
};
name = "${p_name}-${ver_maj}.${ver_min}";
buildInputs =
[ pkgconfig intltool gtk libglade libxfce4util libxfce4ui xfconf
@ -20,11 +21,12 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
meta = {
meta = with stdenv.lib; {
homepage = http://www.xfce.org/projects/xfwm4;
description = "Window manager for Xfce";
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.eelco ];
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = [ maintainers.eelco ];
};
}