b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

makeDBusConf: fail if xsltproc generates empty files

Browse source 
A few people have reported empty files in /etc/dbus-1 which can cause obscure issues.
With this change, users can retry and get non-empty files.

can be tested with
`makeDBusConf { suidHelper = ""; serviceDirectories = []; }`

and adding

```
    rm $out/session.conf
    echo -n "" > $out/session.conf
    # or
    echo "" > $out/session.conf
```
This commit is contained in:
Artturin 2023-07-10 02:40:45 +03:00
parent 4f5e982463
commit a6138b750e
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/libraries/dbus/make-dbus-conf.nix
View file

@ -42,4 +42,8 @@ runCommand "dbus-1"
--stringparam apparmor "$apparmor" \
${./make-session-conf.xsl} ${dbus}/share/dbus-1/session.conf \
> $out/session.conf
# check if files are empty or only contain space characters
grep -q '[^[:space:]]' "$out/system.conf" || (echo "\"$out/system.conf\" was generated incorrectly and is empty, try building again." && exit 1)
grep -q '[^[:space:]]' "$out/session.conf" || (echo "\"$out/session.conf\" was generated incorrectly and is empty, try building again." && exit 1)
''