servo: 0-unstable-2024-09-09 -> 0-unstable-2025-01-14

pkgs/by-name/se/servo/package.nix

@@ -8,10 +8,8 @@
   cargo-deny,
   cmake,
   dbus,
-  gcc,
   git,
   gnumake,
-  libxkbcommon,
   llvm,
   llvmPackages,
   m4,
@@ -20,19 +18,22 @@
   pkg-config,
   python3,
   taplo,
-  vulkan-loader,
   which,
   yasm,
   zlib,
 
   # runtime deps
-  darwin,
+  apple-sdk_14,
   fontconfig,
   freetype,
   gst_all_1,
+  harfbuzz,
+  libcxx,
   libGL,
   libunwind,
+  libxkbcommon,
   udev,
+  vulkan-loader,
   wayland,
   xorg,
 }:
@@ -40,57 +41,46 @@
 let
   customPython = python3.withPackages (
     ps: with ps; [
-      dbus
       packaging
-      pip
-      six
-      virtualenv
     ]
   );
-  runtimePaths = lib.makeLibraryPath [
-    xorg.libXcursor
-    xorg.libXrandr
-    xorg.libXi
-    libxkbcommon
-    vulkan-loader
-    wayland
-    libGL
-  ];
+  runtimePaths = lib.makeLibraryPath (
+    lib.optionals (stdenv.hostPlatform.isLinux) [
+      xorg.libXcursor
+      xorg.libXrandr
+      xorg.libXi
+      libxkbcommon
+      vulkan-loader
+      wayland
+      libGL
+    ]
+  );
 in
 
 rustPlatform.buildRustPackage {
   pname = "servo";
-  version = "0-unstable-2024-09-09";
+  version = "0-unstable-2025-01-14";
 
   src = fetchFromGitHub {
     owner = "servo";
     repo = "servo";
-    rev = "938fd8c12fc2489303e12538d3e3585bd771141f";
-    hash = "sha256-CrpEBFYd8Qd0rxSnT81IvtxxEuYG0jWGJeHISvxalyY=";
+    rev = "f5ef8aaed32e6a6da3faca3a710e73cd35c31059";
+    hash = "sha256-LaAg07Lp/oWNsrtqM6UrqmPAm/ajmPJPZb5O7q9eLO8=";
   };
 
-  # need to use a `Cargo.lock` as there are git dependencies
-  cargoLock = {
-    lockFile = ./Cargo.lock;
-    outputHashes = {
-      "derive_common-0.0.1" = "sha256-z0I2fQQlbUqaFU1EX45eYDy5IbZJ4SIget7WHzq4St0=";
-      "fontsan-0.5.2" = "sha256-4id66xxQ8iu0+OvJKH77WYPUE0eoVa9oUHmr6lRFPa8=";
-      "gilrs-0.10.6" = "sha256-RIfowFShWTPqgVWliK8Fc4cJw0YKITLvmexmTC0SwQk=";
-      "mozjs-0.14.1" = "sha256-RMM28Rd0r58VLfNEJzjWw3Ze6oKEi5lC1Edv03tJbfY=";
-      "peek-poke-0.3.0" = "sha256-WCZYX68vZrPhaAZwpx9/lUp3bVsLMwtmlJSW8wNb2ks=";
-      "servo-media-0.1.0" = "sha256-+J/6ZJPM9eus6YHJA6ENJD63CBiJTtKZdfORq9n6Nf8=";
-      "signpost-0.1.0" = "sha256-xRVXwW3Gynace9Yk5r1q7xA60yy6xhC5wLAyMJ6rPRs=";
-      "webxr-0.0.1" = "sha256-HZ8oWm5BaBLBXo4dS2CbWjpExry7dzeB2ddRLh7+98w=";
-      "naga-22.0.0" = "sha256-Xi2lWZCv4V2mUbQmwV1aw3pcvIIcyltKvv/C+LVqqDI=";
-      "raqote-0.8.5" = "sha256-WLsz5q08VNmYBxUhQ0hOn0K0RVFnnjaWF/MuQGkO/Rg=";
-    };
-  };
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-a5Dv/AiPs/fnKcboBej9H7BiRKCIjm0GaQ2ICiH9SpQ=";
+
+  postPatch = ''
+    # Remap absolute path between modules to include SEMVER
+    substituteInPlace ../servo-0-unstable-*-vendor/servo_atoms-0.0.1/build.rs --replace-fail \
+      "../style/counter_style/predefined.rs" \
+      "../style-0.0.1/counter_style/predefined.rs"
+  '';
 
-  # Remap absolute path between modules to include SEMVER
   # set `HOME` to a temp dir for write access
   # Fix invalid option errors during linking (https://github.com/mozilla/nixpkgs-mozilla/commit/c72ff151a3e25f14182569679ed4cd22ef352328)
   preConfigure = ''
-    sed -i -e 's/\/style\//\/style-0.0.1\//g' ../cargo-vendor-dir/servo_atoms-0.0.1/build.rs
     export HOME=$TMPDIR
     unset AS
   '';
@@ -100,7 +90,6 @@ rustPlatform.buildRustPackage {
     cmake
     customPython
     dbus
-    gcc
     git
     gnumake
     llvm
@@ -117,21 +106,32 @@ rustPlatform.buildRustPackage {
     zlib
   ];
 
-  buildInputs = [
-    fontconfig
-    freetype
-    gst_all_1.gstreamer
-    gst_all_1.gst-plugins-base
-    gst_all_1.gst-plugins-good
-    gst_all_1.gst-plugins-bad
-    gst_all_1.gst-plugins-ugly
-    libunwind
-    udev
-    wayland
-    libGL
-    xorg.libX11
-    xorg.libxcb
-  ] ++ (lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]);
+  buildInputs =
+    [
+      fontconfig
+      freetype
+      gst_all_1.gstreamer
+      gst_all_1.gst-plugins-base
+      gst_all_1.gst-plugins-good
+      gst_all_1.gst-plugins-bad
+      gst_all_1.gst-plugins-ugly
+      harfbuzz
+      libunwind
+      libGL
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      wayland
+      xorg.libX11
+      xorg.libxcb
+      udev
+      vulkan-loader
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      apple-sdk_14
+      libcxx
+    ];
+
+  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-I${lib.getDev libcxx}/include/c++/v1";
 
   # copy resources into `$out` to be used during runtime
   # link runtime libraries