public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

systemd: nixpkgs-fmt

Browse Source 
This was recently introduced, and apparently not nixpkgs-fmt'ed.

While there's no global consensus on nixpkgs-fmt'ing everything,
indenting this by 2 more spaces won't hurt.
This commit is contained in:
Florian Klink 2021-02-03 18:54:07 +01:00
parent 49cb525712
commit f61a3bf8e8
1 changed files with 76 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/os-specific/linux/systemd/default.nix
View File

@ -160,8 +160,8 @@ stdenv.mkDerivation {
--replace \ --replace \
"find_program('objcopy'" \ "find_program('objcopy'" \
"find_program('${stdenv.cc.bintools.targetPrefix}objcopy'" "find_program('${stdenv.cc.bintools.targetPrefix}objcopy'"
'' + (let '' + (
let
# The folllowing dlopen patches ensure that all the features that are # The folllowing dlopen patches ensure that all the features that are
# implemented via dlopen(3) are available (or explicitly deactivated) by # implemented via dlopen(3) are available (or explicitly deactivated) by
# pointing dlopen to the absolute store path instead of relying on the # pointing dlopen to the absolute store path instead of relying on the
@ -215,9 +215,11 @@ stdenv.mkDerivation {
{ name = "libpcre2-8.so.0"; pkg = pcre2; } { name = "libpcre2-8.so.0"; pkg = pcre2; }
]; ];
patchDlOpen = dl: let patchDlOpen = dl:
let
library = "${lib.makeLibraryPath [ dl.pkg ]}/${dl.name}"; library = "${lib.makeLibraryPath [ dl.pkg ]}/${dl.name}";
in if dl.pkg == null then '' in
if dl.pkg == null then ''
# remove the dependency on the library by replacing it with an invalid path # remove the dependency on the library by replacing it with an invalid path
for file in $(grep -lr 'dlopen("${dl.name}"' src); do for file in $(grep -lr 'dlopen("${dl.name}"' src); do
echo "patching dlopen(\"${dl.name}\", …) in $file to an invalid store path ("/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-not-implemented/${dl.name}")…" echo "patching dlopen(\"${dl.name}\", …) in $file to an invalid store path ("/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-not-implemented/${dl.name}")…"
@ -235,8 +237,10 @@ stdenv.mkDerivation {
substituteInPlace "$file" --replace 'dlopen("${dl.name}"' 'dlopen("${library}"' substituteInPlace "$file" --replace 'dlopen("${dl.name}"' 'dlopen("${library}"'
done done
''; '';
in # patch all the dlopen calls to contain absolute paths to the libraries in
lib.concatMapStringsSep "\n" patchDlOpen dlopenLibs) # patch all the dlopen calls to contain absolute paths to the libraries
lib.concatMapStringsSep "\n" patchDlOpen dlopenLibs
)
# finally ensure that there are no left-over dlopen calls that we didn't handle # finally ensure that there are no left-over dlopen calls that we didn't handle
+ '' + ''
if grep -qr 'dlopen("[^/]' src; then if grep -qr 'dlopen("[^/]' src; then