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

Merge pull request #262598 from vikanezrimaya/systemd-properly-wrap-ukify

Browse Source 
systemd: properly wrap ukify by prefixing instead of overwriting PATH
This commit is contained in:
Florian Klink 2023-10-25 18:07:29 +03:00 committed by GitHub
commit 90727298f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -740,7 +740,7 @@ stdenv.mkDerivation (finalAttrs: {
# To cross compile a derivation that builds a UKI with ukify, we need to wrap
# ukify with the correct binutils. When wrapping, no splicing happens so we
# have to explicitly pull binutils from targetPackages.
wrapProgram $out/lib/systemd/ukify --set PATH ${lib.makeBinPath [ targetPackages.stdenv.cc.bintools ] }
wrapProgram $out/lib/systemd/ukify --prefix PATH : ${lib.makeBinPath [ targetPackages.stdenv.cc.bintools ] }:${placeholder "out"}/lib/systemd
'';
disallowedReferences = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform)