diff --git a/etc/shell.nix b/etc/shell.nix deleted file mode 120000 index 314b0bf3e3f..00000000000 --- a/etc/shell.nix +++ /dev/null @@ -1 +0,0 @@ -../shell.nix \ No newline at end of file diff --git a/mach b/mach index 12c5459542e..67d2d45e3d5 100755 --- a/mach +++ b/mach @@ -37,10 +37,10 @@ if __name__ == '__main__': from shlex import quote mach_dir = os.path.abspath(os.path.dirname(__file__)) build_android_args = ['--arg', 'buildAndroid', 'true'] if 'SERVO_ANDROID_BUILD' in os.environ else [] - print('NOTE: Entering nix-shell etc/shell.nix') + print(f'NOTE: Entering nix-shell {mach_dir}/shell.nix') try: # sys argv already contains the ./mach part, so we just need to pass it as-is - result = subprocess.run(['nix-shell', mach_dir + '/etc/shell.nix'] + build_android_args + ['--run', ' '.join(map(quote, sys.argv))]) + result = subprocess.run(['nix-shell', f'{mach_dir}/shell.nix'] + build_android_args + ['--run', ' '.join(map(quote, sys.argv))]) sys.exit(result.returncode) except KeyboardInterrupt: sys.exit(0) diff --git a/python/servo/platform/linux.py b/python/servo/platform/linux.py index 41ec851de83..c6bf1be5b92 100644 --- a/python/servo/platform/linux.py +++ b/python/servo/platform/linux.py @@ -126,7 +126,7 @@ class Linux(Base): print('You will need to run a nix-shell if you are trying ' 'to run any of the built binaries') print('To enter the nix-shell manually use:') - print(' $ nix-shell etc/shell.nix') + print(' $ nix-shell') return False if self.distro.lower() == 'ubuntu' and self.version > '22.04': diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 4a558ecd14a..c4007792f41 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,5 +1,5 @@ [toolchain] -# Be sure to update etc/shell.nix and support/crown/rust-toolchain.toml when bumping this! +# Be sure to update shell.nix and support/crown/rust-toolchain.toml when bumping this! channel = "1.80.1" components = [ diff --git a/support/crown/Cargo.toml b/support/crown/Cargo.toml index 8c2bc3a5306..bddf06b88b7 100644 --- a/support/crown/Cargo.toml +++ b/support/crown/Cargo.toml @@ -7,8 +7,7 @@ license = "MPL-2.0" publish = false # Do not use workspace dependencies in this package! -# In etc/shell.nix, we filter Cargo.lock and build this package in isolation, -# so it needs to make sense without the workspace manifest. +# crown is not part of the Cargo workspace. [dev-dependencies] compiletest_rs = { version = "0.11", features = ["tmp"] }