···

       
129
       
129
       
 
       
        };

     

       
130
       
130
       
 
       


     

       
131
       
131
       
 
       
      outputsList = map outputToAttrListElement outputs;

     

       
132
       
132
       
-
       
  in commonAttrs.${drv.outputName};

     

       
132
       
132
       
+
       
  in commonAttrs // { outputUnspecified = true; };

     

       
133
       
133
       
 
       


     

       
134
       
134
       
 
       


     

       
135
       
135
       
 
       
  /* Strip a derivation of all non-essential attributes, returning

     

···

       
38
       
38
       
 
       
    # environment.pathsToLink, and we can't have both.

     

       
39
       
39
       
 
       
    #environment.pathsToLink = [ "/lib/debug/.build-id" ];

     

       
40
       
40
       
 
       


     

       
41
       
41
       
-
       
    environment.outputsToLink =

     

       
41
       
41
       
+
       
    environment.extraOutputsToLink =

     

       
42
       
42
       
 
       
      optional config.environment.enableDebugInfo "debug";

     

       
43
       
43
       
 
       


     

       
44
       
44
       
 
       
  };

     

···

       
73
       
73
       
 
       
        description = "List of directories to be symlinked in <filename>/run/current-system/sw</filename>.";

     

       
74
       
74
       
 
       
      };

     

       
75
       
75
       
 
       


     

       
76
       
76
       
-
       
      outputsToLink = mkOption {

     

       
76
       
76
       
+
       
      extraOutputsToLink = mkOption {

     

       
77
       
77
       
 
       
        type = types.listOf types.str;

     

       
78
       
78
       
 
       
        default = [ ];

     

       
79
       
79
       
-
       
        example = [ "doc" ];

     

       
80
       
80
       
-
       
        description = "List of package outputs to be symlinked into <filename>/run/current-system/sw</filename>.";

     

       
79
       
79
       
+
       
        example = [ "doc" "info" "docdev" ];

     

       
80
       
80
       
+
       
        description = "List of additional package outputs to be symlinked into <filename>/run/current-system/sw</filename>.";

     

       
81
       
81
       
 
       
      };

     

       
82
       
82
       
 
       


     

       
83
       
83
       
 
       
    };

     
···

       
120
       
120
       
 
       
        "/share/vim-plugins"

     

       
121
       
121
       
 
       
      ];

     

       
122
       
122
       
 
       


     

       
123
       
123
       
-
       
    environment.outputsToLink = [ "bin" "lib" "out" ];

     

       
124
       
124
       
-
       


     

       
125
       
123
       
 
       
    system.path = pkgs.buildEnv {

     

       
126
       
124
       
 
       
      name = "system-path";

     

       
127
       
125
       
 
       
      paths =

     

       
128
       
128
       
-
       
        lib.filter (drv: drv != null && drv != (drv.dev or null))

     

       
129
       
129
       
-
       
          (lib.concatMap (drv:

     

       
130
       
130
       
-
       
            [ drv ] ++ map (outputName: drv.${outputName}.outPath or null) config.environment.outputsToLink)

     

       
131
       
131
       
-
       
           config.environment.systemPackages);

     

       
132
       
132
       
-
       
      inherit (config.environment) pathsToLink;

     

       
126
       
126
       
+
       
        # The default output probably shouldn't be globally configurable.

     

       
127
       
127
       
+
       
        # Services and users should specify them explicitly unless they want this default.

     

       
128
       
128
       
+
       
        map (p: if p.outputUnspecified or false then p.bin or p.out or p else p)

     

       
129
       
129
       
+
       
          config.environment.systemPackages;

     

       
130
       
130
       
+
       
      inherit (config.environment) pathsToLink extraOutputsToLink;

     

       
133
       
131
       
 
       
      ignoreCollisions = true;

     

       
134
       
132
       
 
       
      # !!! Hacky, should modularise.

     

       
133
       
133
       
+
       
      # outputs TODO: note that the tools will often not be linked by default

     

       
135
       
134
       
 
       
      postBuild =

     

       
136
       
135
       
 
       
        ''

     

       
137
       
136
       
 
       
          if [ -x $out/bin/update-mime-database -a -w $out/share/mime ]; then

     

···

       
23
       
23
       
 
       


     

       
24
       
24
       
 
       
    environment.pathsToLink = [ "/share/man" ];

     

       
25
       
25
       
 
       


     

       
26
       
26
       
-
       
    environment.outputsToLink = [ "man" ];

     

       
26
       
26
       
+
       
    environment.extraOutputsToLink = [ "man" ];

     

       
27
       
27
       
 
       


     

       
28
       
28
       
 
       
  };

     

       
29
       
29
       
 
       


     

···

       
59
       
59
       
 
       


     

       
60
       
60
       
 
       
  config = mkIf cfg.enable {

     

       
61
       
61
       
 
       


     

       
62
       
62
       
-
       
    environment.systemPackages = [ pkgs.polkit ];

     

       
62
       
62
       
+
       
    environment.systemPackages = [ pkgs.polkit.bin pkgs.polkit.out ];

     

       
63
       
63
       
 
       


     

       
64
       
64
       
 
       
    systemd.packages = [ pkgs.polkit.out ];

     

       
65
       
65
       
 
       


     

···

       
21
       
21
       
 
       
  # directories in the list is not symlinked.

     

       
22
       
22
       
 
       
  pathsToLink ? ["/"]

     

       
23
       
23
       
 
       


     

       
24
       
24
       
+
       
, # The package outputs to include. By default, only the default

     

       
25
       
25
       
+
       
  # output is included.

     

       
26
       
26
       
+
       
  extraOutputsToLink ? []

     

       
27
       
27
       
+
       


     

       
24
       
28
       
 
       
, # Root the result in directory "$out${extraPrefix}", e.g. "/share".

     

       
25
       
29
       
 
       
  extraPrefix ? ""

     

       
26
       
30
       
 
       


     
···

       
37
       
41
       
 
       
runCommand name

     

       
38
       
42
       
 
       
  rec { inherit manifest ignoreCollisions passthru meta pathsToLink extraPrefix postBuild buildInputs;

     

       
39
       
43
       
 
       
    pkgs = builtins.toJSON (map (drv: {

     

       
40
       
40
       
-
       
      paths = [ drv ];

     

       
44
       
44
       
+
       
      paths =

     

       
45
       
45
       
+
       
        [ drv ]

     

       
46
       
46
       
+
       
        ++ lib.filter (p: p!=null)

     

       
47
       
47
       
+
       
          (builtins.map (outName: drv.${outName} or null) extraOutputsToLink);

     

       
41
       
48
       
 
       
      priority = drv.meta.priority or 5;

     

       
42
       
49
       
 
       
    }) paths);

     

       
43
       
50
       
 
       
    preferLocalBuild = true;