···

       
98
       
98
       
 
       


     

       
99
       
99
       
 
       
      package = mkOption {

     

       
100
       
100
       
 
       
        type = types.package;

     

       
101
       
101
       
-
       
        default = pulseaudioLight;

     

       
102
       
102
       
-
       
        defaultText = "pkgs.pulseaudioLight";

     

       
103
       
103
       
-
       
        example = literalExample "pkgs.pulseaudioFull";

     

       
101
       
101
       
+
       
        default = pulseaudioLight.out;

     

       
102
       
102
       
+
       
        defaultText = "pkgs.pulseaudioLight.out";

     

       
103
       
103
       
+
       
        example = literalExample "pkgs.pulseaudioFull.out";

     

       
104
       
104
       
 
       
        description = ''

     

       
105
       
105
       
 
       
          The PulseAudio derivation to use.  This can be used to enable

     

       
106
       
106
       
 
       
          features (such as JACK support, Bluetooth) via the

     
···

       
130
       
130
       
 
       
        source = clientConf;

     

       
131
       
131
       
 
       
      };

     

       
132
       
132
       
 
       


     

       
133
       
133
       
-
       
      hardware.pulseaudio.configFile = mkDefault "${getBin cfg.package}/etc/pulse/default.pa";

     

       
133
       
133
       
+
       
      hardware.pulseaudio.configFile = mkDefault "${cfg.package.out}/etc/pulse/default.pa";

     

       
134
       
134
       
 
       
    }

     

       
135
       
135
       
 
       


     

       
136
       
136
       
 
       
    (mkIf cfg.enable {

     
···

       
158
       
158
       
 
       
          wantedBy = [ "default.target" ];

     

       
159
       
159
       
 
       
          serviceConfig = {

     

       
160
       
160
       
 
       
            Type = "notify";

     

       
161
       
161
       
-
       
            ExecStart = "${getBin cfg.package}/bin/pulseaudio --daemonize=no";

     

       
161
       
161
       
+
       
            ExecStart = "${cfg.package.out}/bin/pulseaudio --daemonize=no";

     

       
162
       
162
       
 
       
            Restart = "on-failure";

     

       
163
       
163
       
 
       
          };

     

       
164
       
164
       
 
       
        };

     
···

       
195
       
195
       
 
       
        environment.PULSE_RUNTIME_PATH = stateDir;

     

       
196
       
196
       
 
       
        serviceConfig = {

     

       
197
       
197
       
 
       
          Type = "notify";

     

       
198
       
198
       
-
       
          ExecStart = "${getBin cfg.package}/bin/pulseaudio --daemonize=no --log-level=${cfg.daemon.logLevel} --system -n --file=${cfg.configFile}";

     

       
198
       
198
       
+
       
          ExecStart = "${cfg.package.out}/bin/pulseaudio --daemonize=no --log-level=${cfg.daemon.logLevel} --system -n --file=${cfg.configFile}";

     

       
199
       
199
       
 
       
          Restart = "on-failure";

     

       
200
       
200
       
 
       
        };

     

       
201
       
201
       
 
       
      };

     

···

       
111
       
111
       
 
       
            # Load PulseAudio module for routing support.

     

       
112
       
112
       
 
       
            # See http://colin.guthr.ie/2009/10/so-how-does-the-kde-pulseaudio-support-work-anyway/

     

       
113
       
113
       
 
       
            ${optionalString config.hardware.pulseaudio.enable ''

     

       
114
       
114
       
-
       
              ${getBin config.hardware.pulseaudio.package}/bin/pactl load-module module-device-manager "do_routing=1"

     

       
114
       
114
       
+
       
              ${config.hardware.pulseaudio.package}/bin/pactl load-module module-device-manager "do_routing=1"

     

       
115
       
115
       
 
       
            ''}

     

       
116
       
116
       
 
       


     

       
117
       
117
       
 
       
            # Start KDE.

     

···

       
59
       
59
       
 
       
        # Load PulseAudio module for routing support.

     

       
60
       
60
       
 
       
        # See http://colin.guthr.ie/2009/10/so-how-does-the-kde-pulseaudio-support-work-anyway/

     

       
61
       
61
       
 
       
        ${optionalString config.hardware.pulseaudio.enable ''

     

       
62
       
62
       
-
       
          ${getBin config.hardware.pulseaudio.package}/bin/pactl load-module module-device-manager "do_routing=1"

     

       
62
       
62
       
+
       
          ${config.hardware.pulseaudio.package}/bin/pactl load-module module-device-manager "do_routing=1"

     

       
63
       
63
       
 
       
        ''}

     

       
64
       
64
       
 
       


     

       
65
       
65
       
 
       
        exec "${kde5.startkde}"