Skip to content

Commit e97ebe9

Browse files
committed
fix(nix): Fix the default.nix file
These changes are included in stackabletech/operator-templating#557 which will be rolled out at a later point in time. For now, the fixes are included to make this PR completely testable and deployable.
1 parent 9409668 commit e97ebe9

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

default.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# on Darwin (macOS), but doesn't seem to actually be necessary beyond
66
# production hardening.
77
fakeroot =
8-
if self.buildPlatform.isDarwin then
8+
if self.stdenv.buildPlatform.isDarwin then
99
self.writeScriptBin "fakeroot" ''exec "$@"''
1010
else
1111
super.fakeroot;
@@ -14,7 +14,7 @@
1414
# (non-Nix build tools like Tilt, as well as the container composition scripts)
1515
, pkgsLocal ? import nixpkgs { inherit overlays; }
1616
# Default to building for the local CPU architecture
17-
, targetArch ? pkgsLocal.hostPlatform.linuxArch
17+
, targetArch ? pkgsLocal.stdenv.hostPlatform.linuxArch
1818
, targetSystem ? "${targetArch}-unknown-linux-gnu"
1919
, pkgsTarget ? import nixpkgs {
2020
inherit overlays;

nix/sources.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)