diff options
| author | Nathaniel Glen <njag2202@gmail.com> | 2020-10-23 16:09:18 -0400 |
|---|---|---|
| committer | Nathaniel Glen <njag2202@gmail.com> | 2020-10-23 16:35:48 -0400 |
| commit | 57510bf522c90c63fec9b086a42b661ffdaf43c7 (patch) | |
| tree | 75c1f869acff7b98b9be82ee3ada9212e42d24cb | |
| parent | 9397d535bddf4bd296f5d155edf7461d6c379e87 (diff) | |
pipewire: cleanup path testing
| -rw-r--r-- | nixos/modules/services/desktops/pipewire.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/pipewire/test-paths.nix | 29 |
2 files changed, 17 insertions, 14 deletions
diff --git a/nixos/modules/services/desktops/pipewire.nix b/nixos/modules/services/desktops/pipewire.nix index ed1b15380ffe..5179cbaf6bc2 100644 --- a/nixos/modules/services/desktops/pipewire.nix +++ b/nixos/modules/services/desktops/pipewire.nix @@ -100,6 +100,6 @@ in { source = "${pkgs.pipewire}/share/alsa/alsa.conf.d/50-pipewire.conf"; }; environment.sessionVariables.LD_LIBRARY_PATH = - lib.optional (cfg.alsa.enable || cfg.jack.enable || cfg.pulse.enable) "/run/current-system/sw/lib/pipewire"; + lib.optional (cfg.jack.enable || cfg.pulse.enable) "/run/current-system/sw/lib/pipewire"; }; } diff --git a/pkgs/development/libraries/pipewire/test-paths.nix b/pkgs/development/libraries/pipewire/test-paths.nix index 98fbd516a194..0ae693741946 100644 --- a/pkgs/development/libraries/pipewire/test-paths.nix +++ b/pkgs/development/libraries/pipewire/test-paths.nix @@ -1,20 +1,23 @@ { lib, runCommand, pipewire, paths-out, paths-lib }: -runCommand "pipewire-test-paths" { } '' - ${lib.concatMapStringsSep "\n" (p: '' - if [ ! -f "${pipewire.lib}/${p}" ] && [ ! -d "${pipewire.lib}/${p}" ]; then - printf "pipewire failed to find the following path: %s\n" "${pipewire.lib}/${p}" +let + check-path = output: path: '' + if [[ ! -f "${output}/${path}" && ! -d "${output}/${path}" ]]; then + printf "Missing: %s\n" "${output}/${path}" | tee -a $out error=error + else + printf "Found: %s\n" "${output}/${path}" | tee -a $out fi - '') paths-lib} + ''; - ${lib.concatMapStringsSep "\n" (p: '' - if [ ! -f "${pipewire}/${p}" ] && [ ! -d "${pipewire}/${p}" ]; then - printf "pipewire failed to find the following path: %s\n" "${pipewire}/${p}" - error=error - fi - '') paths-out} - - [ -n "$error" ] && exit 1 + check-output = output: lib.concatMapStringsSep "\n" (check-path output); +in runCommand "pipewire-test-paths" { } '' touch $out + + ${check-output pipewire.lib paths-lib} + ${check-output pipewire paths-out} + + if [[ -n "$error" ]]; then + exit 1 + fi '' |