Unverified Commit 90727298 authored by Florian Klink's avatar Florian Klink Committed by GitHub
Browse files

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

systemd: properly wrap ukify by prefixing instead of overwriting PATH
parents 586212ee afe9745e

pkgs/os-specific/linux/systemd/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -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)