diff options
| author | Florian Klink <flokli@flokli.de> | 2023-10-25 18:07:29 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-25 18:07:29 +0300 |
| commit | 90727298f23aeb952c322b58225c8e25ca68e145 (patch) | |
| tree | 926d7dbbe5a4d3269d1312dff4469a8e1cb94a14 /pkgs/os-specific/linux/systemd | |
| parent | 586212ee7774416c35e2f6fa37c81f72caacc467 (diff) | |
| parent | afe9745edb8f0643f0f889d64d561f3d4846f47e (diff) | |
| download | nixpkgs-90727298f23aeb952c322b58225c8e25ca68e145.tar nixpkgs-90727298f23aeb952c322b58225c8e25ca68e145.tar.gz nixpkgs-90727298f23aeb952c322b58225c8e25ca68e145.tar.bz2 nixpkgs-90727298f23aeb952c322b58225c8e25ca68e145.tar.lz nixpkgs-90727298f23aeb952c322b58225c8e25ca68e145.tar.xz nixpkgs-90727298f23aeb952c322b58225c8e25ca68e145.tar.zst nixpkgs-90727298f23aeb952c322b58225c8e25ca68e145.zip | |
Merge pull request #262598 from vikanezrimaya/systemd-properly-wrap-ukify
systemd: properly wrap ukify by prefixing instead of overwriting PATH
Diffstat (limited to 'pkgs/os-specific/linux/systemd')
| -rw-r--r-- | pkgs/os-specific/linux/systemd/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 954977882ee..01054fa7fc6 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -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) |