diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-04-20 16:52:26 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-20 16:52:26 -0400 |
| commit | c351eb2842367845790fda0631ac9917ce6c832b (patch) | |
| tree | 0d195fe4ad2eb8c25b3ef11573fdf0712e543b19 /pkgs/os-specific | |
| parent | bfd9eaeb5379de060b4bed7aabe2e5383b7da96f (diff) | |
| parent | 4224b034cc9cf415517f5779c7a6fc5fda2ff635 (diff) | |
| download | nixpkgs-c351eb2842367845790fda0631ac9917ce6c832b.tar nixpkgs-c351eb2842367845790fda0631ac9917ce6c832b.tar.gz nixpkgs-c351eb2842367845790fda0631ac9917ce6c832b.tar.bz2 nixpkgs-c351eb2842367845790fda0631ac9917ce6c832b.tar.lz nixpkgs-c351eb2842367845790fda0631ac9917ce6c832b.tar.xz nixpkgs-c351eb2842367845790fda0631ac9917ce6c832b.tar.zst nixpkgs-c351eb2842367845790fda0631ac9917ce6c832b.zip | |
Merge pull request #59897 from matthewbauer/mb-cross-fixes2
Miscellaneous cross compilation fixes
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/kernel-headers/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/systemd/default.nix | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix index c00fc1761d5..ea4e041d43a 100644 --- a/pkgs/os-specific/linux/kernel-headers/default.nix +++ b/pkgs/os-specific/linux/kernel-headers/default.nix @@ -12,7 +12,7 @@ let inherit sha256; }; - ARCH = stdenvNoCC.hostPlatform.platform.kernelArch or (throw "missing kernelArch"); + ARCH = stdenvNoCC.hostPlatform.platform.kernelArch or stdenvNoCC.hostPlatform.kernelArch; # It may look odd that we use `stdenvNoCC`, and yet explicit depend on a cc. # We do this so we have a build->build, not build->host, C compiler. diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index d54972c055b..bc071d21ce4 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -129,12 +129,12 @@ in stdenv.mkDerivation rec { test -e $i substituteInPlace $i \ --replace /usr/bin/getent ${getent}/bin/getent \ - --replace /sbin/swapon ${utillinux.bin}/sbin/swapon \ - --replace /sbin/swapoff ${utillinux.bin}/sbin/swapoff \ - --replace /sbin/fsck ${utillinux.bin}/sbin/fsck \ + --replace /sbin/swapon ${lib.getBin utillinux}/sbin/swapon \ + --replace /sbin/swapoff ${lib.getBin utillinux}/sbin/swapoff \ + --replace /sbin/fsck ${lib.getBin utillinux}/sbin/fsck \ --replace /bin/echo ${coreutils}/bin/echo \ --replace /bin/cat ${coreutils}/bin/cat \ - --replace /sbin/sulogin ${utillinux.bin}/sbin/sulogin \ + --replace /sbin/sulogin ${lib.getBin utillinux}/sbin/sulogin \ --replace /usr/lib/systemd/systemd-fsck $out/lib/systemd/systemd-fsck \ --replace /bin/plymouth /run/current-system/sw/bin/plymouth # To avoid dependency done |