commit 8fe37315e40c61f5cf2cd9defcb395f33ce9298c · pyrox.dev/nixpkgs

nixos/tests/xfce.nix

···

       19
       19
        
       

     

       20
       20
        
             services.xserver.desktopManager.xfce.enable = true;

     

       21
       21
        
             environment.systemPackages = [ pkgs.xfce.xfce4-whiskermenu-plugin ];

     

       22
       22
       +
       

     

       23
       23
       +
             programs.thunar.plugins = [ pkgs.xfce.thunar-archive-plugin ];

     

       22
       24
        
           };

     

       23
       25
        
       

     

       24
       26
        
         enableOCR = true;

+48 -67

pkgs/desktops/xfce/core/thunar/default.nix

···

       16
       16
        
         pcre2,

     

       17
       17
        
         xfce4-panel,

     

       18
       18
        
         xfconf,

     

       19
       19
       -
         makeWrapper,

     

       20
       20
       -
         symlinkJoin,

     

       21
       21
       -
         thunarPlugins ? [ ],

     

       22
       19
        
         withIntrospection ? false,

     

       23
       23
       -
         buildPackages,

     

       24
       20
        
         gobject-introspection,

     

       25
       21
        
       }:

     

       26
       22
        
       

     

       27
       27
       -
       let

     

       28
       28
       -
         unwrapped = mkXfceDerivation {

     

       29
       29
       -
           category = "xfce";

     

       30
       30
       -
           pname = "thunar";

     

       31
       31
       -
           version = "4.20.3";

     

       23
       23
       +
       mkXfceDerivation {

     

       24
       24
       +
         category = "xfce";

     

       25
       25
       +
         pname = "thunar";

     

       26
       26
       +
         version = "4.20.3";

     

       32
       27
        
       

     

       33
       33
       -
           sha256 = "sha256-YOh7tuCja9F2VvzX+QqsKHJfebXWbhLqvcraq6PBOGo=";

     

       28
       28
       +
         sha256 = "sha256-YOh7tuCja9F2VvzX+QqsKHJfebXWbhLqvcraq6PBOGo=";

     

       34
       29
        
       

     

       35
       35
       -
           nativeBuildInputs =

     

       36
       36
       -
             [

     

       37
       37
       -
               docbook_xsl

     

       38
       38
       -
               libxslt

     

       39
       39
       -
             ]

     

       40
       40
       -
             ++ lib.optionals withIntrospection [

     

       41
       41
       -
               gobject-introspection

     

       42
       42
       -
             ];

     

       30
       30
       +
         nativeBuildInputs =

     

       31
       31
       +
           [

     

       32
       32
       +
             docbook_xsl

     

       33
       33
       +
             libxslt

     

       34
       34
       +
           ]

     

       35
       35
       +
           ++ lib.optionals withIntrospection [

     

       36
       36
       +
             gobject-introspection

     

       37
       37
       +
           ];

     

       43
       38
        
       

     

       44
       44
       -
           buildInputs = [

     

       45
       45
       -
             exo

     

       46
       46
       -
             gdk-pixbuf

     

       47
       47
       -
             gtk3

     

       48
       48
       -
             libX11

     

       49
       49
       -
             libexif # image properties page

     

       50
       50
       -
             libgudev

     

       51
       51
       -
             libnotify

     

       52
       52
       -
             libxfce4ui

     

       53
       53
       -
             libxfce4util

     

       54
       54
       -
             pcre2 # search & replace renamer

     

       55
       55
       -
             xfce4-panel # trash panel applet plugin

     

       56
       56
       -
             xfconf

     

       57
       57
       -
           ];

     

       39
       39
       +
         buildInputs = [

     

       40
       40
       +
           exo

     

       41
       41
       +
           gdk-pixbuf

     

       42
       42
       +
           gtk3

     

       43
       43
       +
           libX11

     

       44
       44
       +
           libexif # image properties page

     

       45
       45
       +
           libgudev

     

       46
       46
       +
           libnotify

     

       47
       47
       +
           libxfce4ui

     

       48
       48
       +
           libxfce4util

     

       49
       49
       +
           pcre2 # search & replace renamer

     

       50
       50
       +
           xfce4-panel # trash panel applet plugin

     

       51
       51
       +
           xfconf

     

       52
       52
       +
         ];

     

       58
       53
        
       

     

       59
       59
       -
           configureFlags = [ "--with-custom-thunarx-dirs-enabled" ];

     

       54
       54
       +
         configureFlags = [ "--with-custom-thunarx-dirs-enabled" ];

     

       60
       55
        
       

     

       61
       61
       -
           # the desktop file … is in an insecure location»

     

       62
       62
       -
           # which pops up when invoking desktop files that are

     

       63
       63
       -
           # symlinks to the /nix/store

     

       64
       64
       -
           #

     

       65
       65
       -
           # this error was added by this commit:

     

       66
       66
       -
           # https://github.com/xfce-mirror/thunar/commit/1ec8ff89ec5a3314fcd6a57f1475654ddecc9875

     

       67
       67
       -
           postPatch = ''

     

       68
       68
       -
             sed -i -e 's|thunar_dialogs_show_insecure_program (parent, _(".*"), file, exec)|1|' thunar/thunar-file.c

     

       69
       69
       -
           '';

     

       56
       56
       +
         # the desktop file … is in an insecure location»

     

       57
       57
       +
         # which pops up when invoking desktop files that are

     

       58
       58
       +
         # symlinks to the /nix/store

     

       59
       59
       +
         #

     

       60
       60
       +
         # this error was added by this commit:

     

       61
       61
       +
         # https://github.com/xfce-mirror/thunar/commit/1ec8ff89ec5a3314fcd6a57f1475654ddecc9875

     

       62
       62
       +
         postPatch = ''

     

       63
       63
       +
           sed -i -e 's|thunar_dialogs_show_insecure_program (parent, _(".*"), file, exec)|1|' thunar/thunar-file.c

     

       64
       64
       +
         '';

     

       70
       65
        
       

     

       71
       71
       -
           preFixup = ''

     

       72
       72
       -
             gappsWrapperArgs+=(

     

       73
       73
       -
               # https://github.com/NixOS/nixpkgs/issues/329688

     

       74
       74
       -
               --prefix PATH : ${lib.makeBinPath [ exo ]}

     

       75
       75
       -
             )

     

       76
       76
       -
           '';

     

       66
       66
       +
         preFixup = ''

     

       67
       67
       +
           gappsWrapperArgs+=(

     

       68
       68
       +
             # https://github.com/NixOS/nixpkgs/issues/329688

     

       69
       69
       +
             --prefix PATH : ${lib.makeBinPath [ exo ]}

     

       70
       70
       +
           )

     

       71
       71
       +
         '';

     

       77
       72
        
       

     

       78
       78
       -
           meta = with lib; {

     

       79
       79
       -
             description = "Xfce file manager";

     

       80
       80
       -
             mainProgram = "thunar";

     

       81
       81
       -
             teams = [ teams.xfce ];

     

       82
       82
       -
           };

     

       73
       73
       +
         meta = with lib; {

     

       74
       74
       +
           description = "Xfce file manager";

     

       75
       75
       +
           mainProgram = "thunar";

     

       76
       76
       +
           teams = [ teams.xfce ];

     

       83
       77
        
         };

     

       84
       84
       -
       

     

       85
       85
       -
       in

     

       86
       86
       -
       if thunarPlugins == [ ] then

     

       87
       87
       -
         unwrapped

     

       88
       88
       -
       else

     

       89
       89
       -
         import ./wrapper.nix {

     

       90
       90
       -
           inherit

     

       91
       91
       -
             makeWrapper

     

       92
       92
       -
             symlinkJoin

     

       93
       93
       -
             thunarPlugins

     

       94
       94
       -
             lib

     

       95
       95
       -
             ;

     

       96
       96
       -
           thunar = unwrapped;

     

       97
       97
       -
         }

     

       78
       78
       +
       }

+48 -40

pkgs/desktops/xfce/core/thunar/wrapper.nix

···

       2
       2
        
         lib,

     

       3
       3
        
         makeWrapper,

     

       4
       4
        
         symlinkJoin,

     

       5
       5
       -
         thunar,

     

       6
       6
       -
         thunarPlugins,

     

       5
       5
       +
         thunar-unwrapped,

     

       6
       6
       +
         thunarPlugins ? [ ],

     

       7
       7
        
       }:

     

       8
       8
        
       

     

       9
       9
       -
       symlinkJoin {

     

       10
       10
       -
         name = "thunar-with-plugins-${thunar.version}";

     

       9
       9
       +
       let

     

       10
       10
       +
         thunar = thunar-unwrapped;

     

       11
       11
       +
       in

     

       11
       12
        
       

     

       12
       12
       -
         paths = [ thunar ] ++ thunarPlugins;

     

       13
       13
       +
       if thunarPlugins == [ ] then

     

       14
       14
       +
         thunar

     

       13
       15
        
       

     

       14
       14
       -
         nativeBuildInputs = [ makeWrapper ];

     

       16
       16
       +
       else

     

       17
       17
       +
         symlinkJoin {

     

       18
       18
       +
           name = "thunar-with-plugins-${thunar.version}";

     

       15
       19
        
       

     

       16
       16
       -
         postBuild = ''

     

       17
       17
       -
           wrapProgram "$out/bin/thunar" \

     

       18
       18
       -
             --set "THUNARX_DIRS" "$out/lib/thunarx-3"

     

       20
       20
       +
           paths = [ thunar ] ++ thunarPlugins;

     

       19
       21
        
       

     

       20
       20
       -
           wrapProgram "$out/bin/thunar-settings" \

     

       21
       21
       -
             --set "THUNARX_DIRS" "$out/lib/thunarx-3"

     

       22
       22
       +
           nativeBuildInputs = [ makeWrapper ];

     

       22
       23
        
       

     

       23
       23
       -
           # NOTE: we need to remove the folder symlink itself and create

     

       24
       24
       -
           # a new folder before trying to substitute any file below.

     

       25
       25
       -
           rm -f "$out/lib/systemd/user"

     

       26
       26
       -
           mkdir -p "$out/lib/systemd/user"

     

       24
       24
       +
           postBuild = ''

     

       25
       25
       +
             wrapProgram "$out/bin/thunar" \

     

       26
       26
       +
               --set "THUNARX_DIRS" "$out/lib/thunarx-3"

     

       27
       27
        
       

     

       28
       28
       -
           # point to wrapped binary in all service files

     

       29
       29
       -
           for file in "lib/systemd/user/thunar.service" \

     

       30
       30
       -
             "share/dbus-1/services/org.xfce.FileManager.service" \

     

       31
       31
       -
             "share/dbus-1/services/org.xfce.Thunar.FileManager1.service" \

     

       32
       32
       -
             "share/dbus-1/services/org.xfce.Thunar.service"

     

       33
       33
       -
           do

     

       34
       34
       -
             rm -f "$out/$file"

     

       35
       35
       -
             substitute "${thunar}/$file" "$out/$file" \

     

       36
       36
       -
               --replace "${thunar}" "$out"

     

       37
       37
       -
           done

     

       38
       38
       -
         '';

     

       28
       28
       +
             wrapProgram "$out/bin/thunar-settings" \

     

       29
       29
       +
               --set "THUNARX_DIRS" "$out/lib/thunarx-3"

     

       39
       30
        
       

     

       40
       40
       -
         meta = with lib; {

     

       41
       41
       -
           inherit (thunar.meta)

     

       42
       42
       -
             homepage

     

       43
       43
       -
             license

     

       44
       44
       -
             platforms

     

       45
       45
       -
             teams

     

       46
       46
       -
             ;

     

       31
       31
       +
             # NOTE: we need to remove the folder symlink itself and create

     

       32
       32
       +
             # a new folder before trying to substitute any file below.

     

       33
       33
       +
             rm -f "$out/lib/systemd/user"

     

       34
       34
       +
             mkdir -p "$out/lib/systemd/user"

     

       47
       35
        
       

     

       48
       48
       -
           description =

     

       49
       49
       -
             thunar.meta.description

     

       50
       50
       -
             +

     

       51
       51
       -
               optionalString (0 != length thunarPlugins)

     

       52
       52
       -
                 " (with plugins: ${concatStringsSep ", " (map (x: x.name) thunarPlugins)})";

     

       53
       53
       -
         };

     

       54
       54
       -
       }

     

       36
       36
       +
             # point to wrapped binary in all service files

     

       37
       37
       +
             for file in "lib/systemd/user/thunar.service" \

     

       38
       38
       +
               "share/dbus-1/services/org.xfce.FileManager.service" \

     

       39
       39
       +
               "share/dbus-1/services/org.xfce.Thunar.FileManager1.service" \

     

       40
       40
       +
               "share/dbus-1/services/org.xfce.Thunar.service"

     

       41
       41
       +
             do

     

       42
       42
       +
               rm -f "$out/$file"

     

       43
       43
       +
               substitute "${thunar}/$file" "$out/$file" \

     

       44
       44
       +
                 --replace "${thunar}" "$out"

     

       45
       45
       +
             done

     

       46
       46
       +
           '';

     

       47
       47
       +
       

     

       48
       48
       +
           meta = with lib; {

     

       49
       49
       +
             inherit (thunar.meta)

     

       50
       50
       +
               homepage

     

       51
       51
       +
               license

     

       52
       52
       +
               platforms

     

       53
       53
       +
               teams

     

       54
       54
       +
               ;

     

       55
       55
       +
       

     

       56
       56
       +
             description =

     

       57
       57
       +
               thunar.meta.description

     

       58
       58
       +
               +

     

       59
       59
       +
                 optionalString (0 != length thunarPlugins)

     

       60
       60
       +
                   " (with plugins: ${concatStringsSep ", " (map (x: x.name) thunarPlugins)})";

     

       61
       61
       +
           };

     

       62
       62
       +
         }

+4 -4

pkgs/desktops/xfce/default.nix

···

       33
       33
        
       

     

       34
       34
        
             libxfce4windowing = callPackage ./core/libxfce4windowing { };

     

       35
       35
        
       

     

       36
       36
       -
             thunar = callPackage ./core/thunar {

     

       37
       37
       -
               thunarPlugins = [ ];

     

       38
       38
       -
             };

     

       36
       36
       +
             thunar-unwrapped = callPackage ./core/thunar { };

     

       37
       37
       +
       

     

       38
       38
       +
             thunar = callPackage ./core/thunar/wrapper.nix { };

     

       39
       39
        
       

     

       40
       40
        
             thunar-volman = callPackage ./core/thunar-volman { };

     

       41
       41
        
       

     
···

       169
       169
        
       

     

       170
       170
        
             xinitrc = self.xfce4-session.xinitrc; # added 2019-11-04

     

       171
       171
        
       

     

       172
       172
       -
             thunar-bare = self.thunar.override { thunarPlugins = [ ]; }; # added 2019-11-04

     

       172
       172
       +
             thunar-bare = self.thunar-unwrapped; # added 2019-11-04

     

       173
       173
        
       

     

       174
       174
        
             xfce4-datetime-plugin = throw ''

     

       175
       175
        
               xfce4-datetime-plugin has been removed: this plugin has been merged into the xfce4-panel's built-in clock