aboutsummaryrefslogtreecommitdiffstats
path: root/etc/shell.nix
Commit message (Collapse)AuthorAgeFilesLines
* install libudev-dev required by gamepad API (#31376)Mukilan Thiyagarajan2024-02-191-0/+2
| | | | | | | | | | | | | | Ubuntu 20.04 does not have libudev-dev causing build failure when compiling libudev-sys, which is in-turn needed by gilrs-core. Similarly, nix build also needs the udev C library. On Ubuntu 22.04, we don't see the build failures since the build dependency 'libgstreamer-plugins-base-1.0-dev' transitively pulls in libudev-dev. Fixes #31373 Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com>
* mach: fix shell.nix to actually include android pkgs (#31279)Mukilan Thiyagarajan2024-02-081-7/+8
| | | | | | | Fix issue with precedence due to which the android environment variables were being added to the output of mkDerivation instead of the input attribute set. Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com>
* Make Android build optional on Nix (#31231)Smitty2024-02-021-11/+13
| | | | | | | | | | | | | | | * Make Android build optional on Nix I want to build Servo without also installing the entire Android SDK. This makes it so Android support is only built if `buildAndroid` is true. Signed-off-by: syvb <me@iter.ca> * Add Android support to nix-shell if SERVO_ANDROID_BUILD set --------- Signed-off-by: syvb <me@iter.ca>
* Preliminary Android build support (#31086)Mukilan Thiyagarajan2024-01-221-1/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Android build * Fixes * More fixes - Still failing in the linking step * More work on getting linking working Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com> * android: use mozjs with ndk r25c. loads servo.org more android build fixes. * fix ./mach run for android and make it follow logs Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com> * add experimental logic for compositor pause/resume Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com> * pass DPI from android to simpleservo Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com> * ci: add android workflow Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com> * switch to ANDROID_SDK_ROOT and ANDROID_NDK_ROOT vars Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com> * upgrade gradle to 4.10.1 Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com> * upgrade to gradle 5.1.1 Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com> * upgrade to gradle 8 and agp 8 Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com> * make compositing work again with external present Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com> * android: improve mach support for non-NixOS and CI Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com> * fix sampler compilation bug introduced in #30490 Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com> * ci: add android build to main workflow Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com> * gradle: set MinSdk = targetSdk = 30 NDK requires we compile against the minSdk API level which is 30 in our case. Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com> * add instructions for android in README.md Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com> * apk: move servosurface to servoview Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com> * apk: uncomment the mediasession callbacks on MainActivity Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com> * apk: fix crash on MainAtivity.onDestroy Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com> * apk: drop VR, arm 5 and unused code This commit drops: * support for google, oculusvr * support for arm5 architecture and also removes * fakeld scripts * unused java code Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com> * cleanup shell.nix Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com> * android: add FIXMEs for gstreamer code Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com> * apk: remove commented code and debug logs Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com> * cleanup ServoView.java Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com> * mach: comment call to download gstreamer deps for android Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com> * disable bluetooth for jniapi as blurdroid is broken Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com> * fixup! README.md * fixup! remove change in Cargo.toml * fixup! move shell variables together * fixup! cleanup jniapi/Cargo.toml comments * delete commented gstreamer related android code Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com> * remove unused config variable in servbuild Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com> * android: more cleanup Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com> * force no_static_freetype only for android * use actions to manage sdk, ndk and java Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com> * rename embedder event names to be more clear. Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com> * link to startup crash issue Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com> * fix lint issues Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com> * upgrade env_logger to 0.10 with duplicate exception libservo and android_logger can use env_logger 0.10 but quickcheck is still stuck on 0.8 and has not seen any activity in the last 2 years. This commit adds a duplicate exception until the quickcheck dependency can be upgraded (or replaced) Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com> * android: fix comments Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com> * disable jemalloc on android Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com> * fixup! replace linux with android in cfg --------- Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com> Co-authored-by: Martin Robinson <mrobinson@igalia.com>
* Nix: bump nixpkgs to nixos-unstable (#31055)Delan Azabani2024-01-111-2/+9
| | | | | | | | | | | * Nix: bump nixpkgs to nixos-unstable (except gnumake + clang) * we can get clang 11 from nixos-unstable * bump clang to 15 * simplify approach now that we get clang from nixos-unstable * drop clang to version 14 (#31059)
* Nix: bump nixpkgs to nixos-23.05 (except gnumake) (#31052)Delan Azabani2024-01-101-2/+6
| | | | | | | | | * Nix: bump nixpkgs to nixos-23.05 (except gnumake) * try nixos-unstable except clangStdenv + LIBCLANG_PATH * revert due to missing @GLIBC_2.38 symbols (db2f8c5d9df90b6153d27d024fa9a8e465f4c1ef)
* Allow building with Nix on Linux distros other than NixOS (#31001)Delan Azabani2024-01-091-5/+50
| | | | | | | | | | | | | | | | | | | | | | | | | * remove NixOS check from mach wrapper * pin nixpkgs to fix jemalloc-sys + mozangle build scripts * add stdenv.cc.cc to LD_LIBRARY_PATH to fix webrender build.rs * add all buildInputs to LD_LIBRARY_PATH to fix ldd servo * add glib + zlib to buildInputs to fix ldd servo * working! patchelf --remove-rpath --set-interpreter * undo changes that were ultimately unhelpful * make compiled programs independent of Nix * avoid installing patchelf’d toolchains in ~/.rustup * remove another spurious change * fix rustup pollution * only enable on other distros when MACH_USE_NIX is set
* Fix crown on NixOS (#30987)Delan Azabani2024-01-051-3/+70
| | | | | | | | | | | | | | | | | | | | | * Fix crown on NixOS * no need to install libs, because there are none * fix program name in usage message * use the cargo provided by each buildPhase * cargo update --offline can be used to reformat lockfiles * document how to keep rust-toolchain.toml and etc/shell.nix in sync * clarify comment about allowBuiltinFetchGit * fix license * clarify purpose of filterlock * explain why crown must not use workspace dependencies
* Remove some stray references to OpenSSL (#30710)Martin Robinson2023-11-091-1/+1
| | | These were left over from the change to use rustls.
* Add taplo to etc/shell.nix (#30487)Mukilan Thiyagarajan2023-10-041-0/+1
| | | | | | This addresses the 'Could not find `taplo` ...' message when running `./mach test-tidy` on NixOS. Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com>
* fix WebGPU runtime dependencies on linux (#30407)Delan Azabani2023-09-221-2/+9
|
* Use MozTools 4 and update mozjs (#30326)Samson2023-09-111-1/+1
| | | | | | | | | | | | | | | | | | | * Update mozjs * moztools4 in bootstrap * no autoconf * tidy * switch to servo-build-deps * update mozjs for real * glue mozjs * fmt * move to servo/mozjs
* Pin GNU Make to 4.3 on NixOS (#30146)Mukilan Thiyagarajan2023-08-211-1/+11
| | | Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com>
* Use system lld on NixOS instead of rust-lld (#30123)Mukilan Thiyagarajan2023-08-181-0/+1
| | | | | | | | | | | | | | | | The -Zgcc-ld=lld flag makes rust use the rust-lld linker that is distributed as part of rust toolchain. However, this flag doesn't work on nixos correctly as 1) rust-lld needs to be patched to have the correct rpath to find libz.so 2) the bin/gcc-ld/ld.lld wrapper which calls rust-lld also needs to be patched to use the correct dynamic loader 3) rust-lld doesn't respect NIX_LDFLAGS which contains the additional search path derived from buildInputs. The system linkers on nixos are wrapped so that NIX_LDFLAGS is added as the rpath to the final binary. Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com>
* Update shell.nixMifom2023-04-091-1/+2
| | | | Replace deprecated xlibsWrapper with just xorg.libX11
* chore(nix): replace `pkgconfig` with `pkg-config`yvt2022-10-071-1/+1
| | | | `pkgconfig` has been renamed to `pkg-config` in nixpkgs.
* chore(nix): add `AppKit` to `buildInputs` on Darwinyvt2022-09-161-1/+3
| | | | Signed-off-by: yvt <i@yvt.jp>
* Update nix-shell package namesNathan Lefler2022-07-311-1/+1
| | | | | | | "xlibs" has been renamed to "xorg" "x11" has been renamed to "xlibsWrapper" Signed-off-by: Nathan Lefler <nathan@lefler.me>
* chore(nix): define `LD_LIBRARY_PATH` outside `shellHook`yvt2021-10-161-2/+3
| | | | | For consistency with other environment variables defined in the same file.
* chore(nix): add `libxkbcommon` to `LD_LIBRARY_PATH`yvt2021-10-161-1/+1
|
* add etc/shell.nix for nix/nixOSMaciej Krüger2021-05-311-0/+40
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-22 13:21:32 +0000