commit 65eb3a590d8d5657e3bf8534ddccc827aefc1862 · pyrox.dev/nixpkgs

+21

nixos/doc/manual/release-notes/rl-1809.xml

···

       19
       19
        
       

     

       20
       20
        
         <itemizedlist>

     

       21
       21
        
          <listitem>

     

       22
       22
       +
            <para>

     

       23
       23
       +
              Support for wrapping binaries using <literal>firejail</literal> has been

     

       24
       24
       +
              added through <varname>programs.firejail.wrappedBinaries</varname>.

     

       25
       25
       +
            </para>

     

       26
       26
       +
            <para>

     

       27
       27
       +
              For example

     

       28
       28
       +
            </para>

     

       29
       29
       +
       <programlisting>

     

       30
       30
       +
       programs.firejail = {

     

       31
       31
       +
         enable = true;

     

       32
       32
       +
         wrappedBinaries = {

     

       33
       33
       +
           firefox = "${lib.getBin pkgs.firefox}/bin/firefox";

     

       34
       34
       +
           mpv = "${lib.getBin pkgs.mpv}/bin/mpv";

     

       35
       35
       +
         };

     

       36
       36
       +
       };

     

       37
       37
       +
       </programlisting>

     

       38
       38
       +
             <para>

     

       39
       39
       +
               This will place <literal>firefox</literal> and <literal>mpv</literal> binaries in the global path wrapped by firejail.

     

       40
       40
       +
             </para>

     

       41
       41
       +
          </listitem>

     

       42
       42
       +
          <listitem>

     

       22
       43
        
           <para>

     

       23
       44
        
            User channels are now in the default <literal>NIX_PATH</literal>, allowing

     

       24
       45
        
            users to use their personal <command>nix-channel</command> defined

nixos/modules/module-list.nix

···

       86
       86
        
         ./programs/dconf.nix

     

       87
       87
        
         ./programs/digitalbitbox/default.nix

     

       88
       88
        
         ./programs/environment.nix

     

       89
       89
       +
         ./programs/firejail.nix

     

       89
       90
        
         ./programs/fish.nix

     

       90
       91
        
         ./programs/freetds.nix

     

       91
       92
        
         ./programs/gnupg.nix

+48

nixos/modules/programs/firejail.nix

···

       1
       1
       +
       { config, lib, pkgs, ... }:

     

       2
       2
       +
       

     

       3
       3
       +
       with lib;

     

       4
       4
       +
       

     

       5
       5
       +
       let

     

       6
       6
       +
         cfg = config.programs.firejail;

     

       7
       7
       +
       

     

       8
       8
       +
         wrappedBins = pkgs.stdenv.mkDerivation rec {

     

       9
       9
       +
           name = "firejail-wrapped-binaries";

     

       10
       10
       +
           nativeBuildInputs = with pkgs; [ makeWrapper ];

     

       11
       11
       +
           buildCommand = ''

     

       12
       12
       +
             mkdir -p $out/bin

     

       13
       13
       +
             ${lib.concatStringsSep "\n" (lib.mapAttrsToList (command: binary: ''

     

       14
       14
       +
             cat <<_EOF >$out/bin/${command}

     

       15
       15
       +
             #!${pkgs.stdenv.shell} -e

     

       16
       16
       +
             /run/wrappers/bin/firejail ${binary} "\$@"

     

       17
       17
       +
             _EOF

     

       18
       18
       +
             chmod 0755 $out/bin/${command}

     

       19
       19
       +
             '') cfg.wrappedBinaries)}

     

       20
       20
       +
           '';

     

       21
       21
       +
         };

     

       22
       22
       +
       

     

       23
       23
       +
       in {

     

       24
       24
       +
         options.programs.firejail = {

     

       25
       25
       +
           enable = mkEnableOption "firejail";

     

       26
       26
       +
       

     

       27
       27
       +
           wrappedBinaries = mkOption {

     

       28
       28
       +
             type = types.attrs;

     

       29
       29
       +
             default = {};

     

       30
       30
       +
             description = ''

     

       31
       31
       +
               Wrap the binaries in firejail and place them in the global path.

     

       32
       32
       +
               </para>

     

       33
       33
       +
               <para>

     

       34
       34
       +
               You will get file collisions if you put the actual application binary in

     

       35
       35
       +
               the global environment and applications started via .desktop files are

     

       36
       36
       +
               not wrapped if they specify the absolute path to the binary.

     

       37
       37
       +
             '';

     

       38
       38
       +
           };

     

       39
       39
       +
         };

     

       40
       40
       +
       

     

       41
       41
       +
         config = mkIf cfg.enable {

     

       42
       42
       +
           security.wrappers.firejail.source = "${lib.getBin pkgs.firejail}/bin/firejail";

     

       43
       43
       +
       

     

       44
       44
       +
           environment.systemPackages = [ wrappedBins ];

     

       45
       45
       +
         };

     

       46
       46
       +
       

     

       47
       47
       +
         meta.maintainers = with maintainers; [ peterhoeg ];

     

       48
       48
       +
       }