diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2015-10-14 13:23:37 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2015-10-14 14:32:26 +0200 |
commit | 04c7506f0f9f47f3f38c3d5dff7b8dabc36368b6 (patch) | |
tree | 6e608dd4bec7e8ec3b709173d081650426e33c71 /pkgs/desktops/xfce/core/xfdesktop.nix | |
parent | 2490848627b43c8393563b8ee50042cc8356a7f2 (diff) | |
download | nixlib-04c7506f0f9f47f3f38c3d5dff7b8dabc36368b6.tar nixlib-04c7506f0f9f47f3f38c3d5dff7b8dabc36368b6.tar.gz nixlib-04c7506f0f9f47f3f38c3d5dff7b8dabc36368b6.tar.bz2 nixlib-04c7506f0f9f47f3f38c3d5dff7b8dabc36368b6.tar.lz nixlib-04c7506f0f9f47f3f38c3d5dff7b8dabc36368b6.tar.xz nixlib-04c7506f0f9f47f3f38c3d5dff7b8dabc36368b6.tar.zst nixlib-04c7506f0f9f47f3f38c3d5dff7b8dabc36368b6.zip |
xfce core: split into outputs, change style
- 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.
Diffstat (limited to 'pkgs/desktops/xfce/core/xfdesktop.nix')
-rw-r--r-- | pkgs/desktops/xfce/core/xfdesktop.nix | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/pkgs/desktops/xfce/core/xfdesktop.nix b/pkgs/desktops/xfce/core/xfdesktop.nix index e5d04879008e..8802862eddde 100644 --- a/pkgs/desktops/xfce/core/xfdesktop.nix +++ b/pkgs/desktops/xfce/core/xfdesktop.nix @@ -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 ]; }; } + |