commit 208d1f24db9966c18e1a3aca3b99ec4eae362607 · pyrox.dev/nixpkgs

-1

nixos/modules/services/x11/desktop-managers/xfce.nix

···

       46
       46
        
               pkgs.which # Needed by the xfce's xinitrc script.

     

       47
       47
        
               pkgs.xfce.exo

     

       48
       48
        
               pkgs.xfce.gtk_xfce_engine

     

       49
       49
       -
               pkgs.xfce.libxfcegui4 # For the icons.

     

       50
       49
        
               pkgs.xfce.mousepad

     

       51
       50
        
               pkgs.xfce.ristretto

     

       52
       51
        
               pkgs.xfce.terminal

+11 -9

pkgs/desktops/xfce/applications/mousepad.nix

···

       1
       1
       -
       { stdenv, fetchurl, pkgconfig, intltool, libxfce4util, libxfcegui4

     

       2
       2
       -
       , gtk, gtksourceview, dbus, dbus_glib }:

     

       1
       1
       +
       { stdenv, fetchurl, pkgconfig, intltool, libxfce4util

     

       2
       2
       +
       , gtk, gtksourceview, dbus, dbus_glib, makeWrapper }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         p_name  = "mousepad";

     

       6
       6
       -
         ver_maj = "0.3";

     

       6
       6
       +
         ver_maj = "0.4";

     

       7
       7
        
         ver_min = "0";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchurl {

     

       10
       10
        
           url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2";

     

       11
       11
       -
           sha256 = "0v84zwhjv2xynvisn5vmp7dbxfj4l4258m82ks7hn3adk437bwhh";

     

       11
       11
       +
           sha256 = "60114431eac8db6bb6ce18bd38f1630cccb684375b97a445a1b6fd619848d132";

     

       12
       12
        
         };

     

       13
       13
        
         name = "${p_name}-${ver_maj}.${ver_min}";

     

       14
       14
        
       

     

       15
       15
        
         buildInputs =

     

       16
       16
       -
           [ pkgconfig intltool libxfce4util libxfcegui4

     

       17
       17
       -
             gtk gtksourceview dbus dbus_glib

     

       16
       16
       +
           [ pkgconfig intltool libxfce4util

     

       17
       17
       +
             gtk gtksourceview dbus dbus_glib makeWrapper

     

       18
       18
        
           ];

     

       19
       19
        
       

     

       20
       20
       -
         # Propagate gtksourceview into $XDG_DATA_DIRS to provide syntax

     

       21
       21
       -
         # highlighting (in fact Mousepad segfaults without it).

     

       22
       22
       -
         propagatedUserEnvPkgs = [ gtksourceview ];

     

       20
       20
       +
         preFixup = ''

     

       21
       21
       +
           wrapProgram "$out/bin/mousepad" \

     

       22
       22
       +
             --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:${gtksourceview}/share"

     

       23
       23
       +
         '';

     

       23
       24
        
       

     

       24
       25
        
         meta = {

     

       25
       26
        
           homepage = http://www.xfce.org/;

     

       26
       27
        
           description = "A simple text editor for Xfce";

     

       27
       28
        
           license = stdenv.lib.licenses.gpl2Plus;

     

       29
       29
       +
           platforms = stdenv.lib.platforms.linux;

     

       28
       30
        
         };

     

       29
       31
        
       }

+2 -2

pkgs/desktops/xfce/core/gtk-xfce-engine.nix

···

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         p_name  = "gtk-xfce-engine";

     

       5
       5
        
         ver_maj = "2.10";

     

       6
       6
       -
         ver_min = "0";

     

       6
       6
       +
         ver_min = "1";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchurl {

     

       9
       9
        
           url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";

     

       10
       10
       -
           sha256 = "0rqrnjxx1lzla7wp2fadyixs6jy0js6xh005pgwyqbigpl0v7hy1";

     

       10
       10
       +
           sha256 = "4a92910205881f707f2cc8d3c9b00a95feb58eb9084d932c841f3ed027f7063d";

     

       11
       11
        
         };

     

       12
       12
        
         name = "${p_name}-${ver_maj}.${ver_min}";

     

       13
       13

+3 -3

pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix

···

       3
       3
        
       with stdenv.lib;

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         p_name  = "xfce4-cpufreq-plugin";

     

       6
       6
       -
         ver_maj = "1.0";

     

       7
       7
       -
         ver_min = "0";

     

       6
       6
       +
         ver_maj = "1.1";

     

       7
       7
       +
         ver_min = "1";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchurl {

     

       10
       10
        
           url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2";

     

       11
       11
       -
           sha256 = "0q2lj8a25iq9w3dynh6qvsmh19y1v7i82g46yza6gvw7fjcrmcz1";

     

       11
       11
       +
           sha256 = "1ryaynkxpqpp92pj18bdds869sf560ir1k3bgl8gqnz60z04ak27";

     

       12
       12
        
         };

     

       13
       13
        
         name = "${p_name}-${ver_maj}.${ver_min}";

     

       14
       14

+2 -2

pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix

···

       1
       1
       -
       { stdenv, fetchurl, pkgconfig, intltool, glib, exo, libXtst, xproto, libxfce4util, xfce4panel, libxfce4ui, libxfcegui4, xfconf, gtk}:

     

       1
       1
       +
       { stdenv, fetchurl, pkgconfig, intltool, glib, exo, libXtst, xproto, libxfce4util, xfce4panel, libxfce4ui, xfconf, gtk}:

     

       2
       2
        
       

     

       3
       3
        
       with stdenv.lib;

     

       4
       4
        
       stdenv.mkDerivation rec {

     
···

       12
       12
        
         };

     

       13
       13
        
         name = "${p_name}-${ver_maj}.${ver_min}";

     

       14
       14
        
       

     

       15
       15
       -
         buildInputs = [ pkgconfig intltool glib exo libXtst xproto libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ];

     

       15
       15
       +
         buildInputs = [ pkgconfig intltool glib exo libXtst xproto libxfce4util libxfce4ui xfce4panel xfconf gtk ];

     

       16
       16
        
         preFixup = "rm $out/share/icons/hicolor/icon-theme.cache";

     

       17
       17
        
       

     

       18
       18
        
         meta = {

+1

pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix

···

       19
       19
        
           description = "Dictionary plugin for Xfce panel";

     

       20
       20
        
           platforms = platforms.linux;

     

       21
       21
        
           maintainers = [ maintainers.AndersonTorres ];

     

       22
       22
       +
           broken = true; # see http://goodies.xfce.org/projects/panel-plugins/xfce4-dict-plugin

     

       22
       23
        
         };

     

       23
       24
        
       }

+1

pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix

···

       19
       19
        
           description = "Sticky notes plugin for Xfce panel";

     

       20
       20
        
           platforms = platforms.linux;

     

       21
       21
        
           maintainers = [ maintainers.AndersonTorres ];

     

       22
       22
       +
           broken = true;

     

       22
       23
        
         };

     

       23
       24
        
       }

+4 -4

pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, intltool, glib, exo, pcre

     

       2
       2
       -
       , libxfce4util, xfce4panel, libxfce4ui, libxfcegui4, xfconf, gtk}:

     

       2
       2
       +
       , libxfce4util, xfce4panel, libxfce4ui, xfconf, gtk }:

     

       3
       3
        
       

     

       4
       4
        
       with stdenv.lib;

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
        
         p_name  = "xfce4-verve-plugin";

     

       7
       7
        
         ver_maj = "1.0";

     

       8
       8
       -
         ver_min = "0";

     

       8
       8
       +
         ver_min = "1";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchurl {

     

       11
       11
        
           url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2";

     

       12
       12
       -
           sha256 = "18zi8lam82xwjm5zdnilg3ffxpp5z8vjad3kjvdsyxdhsdza84fh";

     

       12
       12
       +
           sha256 = "1y4vvk3nk1haq39xw0gzscsnnj059am1p3acgq9mj0miyiz8971v";

     

       13
       13
        
         };

     

       14
       14
        
         name = "${p_name}-${ver_maj}.${ver_min}";

     

       15
       15
        
       

     

       16
       16
       -
         buildInputs = [ pkgconfig intltool glib exo pcre libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ];

     

       16
       16
       +
         buildInputs = [ pkgconfig intltool glib exo pcre libxfce4util libxfce4ui xfce4panel xfconf gtk ];

     

       17
       17
        
       

     

       18
       18
        
         meta = {

     

       19
       19
        
           homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";

+2 -2

pkgs/top-level/all-packages.nix

···

       12962
       12962
        
       

     

       12963
       12963
        
         kde5 = kf5_stable // plasma5_stable // kdeApps_stable;

     

       12964
       12964
        
       

     

       12965
       12965
       -
         xfce = xfce4_10;

     

       12966
       12966
       -
         xfce4_10 = recurseIntoAttrs (import ../desktops/xfce { inherit config pkgs newScope; });

     

       12965
       12965
       +
         xfce = xfce4-12;

     

       12966
       12966
       +
         xfce4-12 = recurseIntoAttrs (import ../desktops/xfce { inherit config pkgs newScope; });

     

       12967
       12967
        
       

     

       12968
       12968
        
         xrandr-invert-colors = callPackage ../applications/misc/xrandr-invert-colors { };

     

       12969
       12969