diff --git a/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix b/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix index 26f7d9138cc3..f5645f563de3 100644 --- a/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix +++ b/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cargo, rustc, autoreconfHook, jdk, glib, xulrunner, zip, pkg-config, npapi_sdk, bash, bc }: +{ lib, stdenv, fetchFromGitHub, cargo, rustc, autoreconfHook, jdk, glib, firefox-unwrapped, zip, pkg-config, npapi_sdk, bash, bc }: stdenv.mkDerivation rec { pname = "adoptopenjdk-icedtea-web"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook pkg-config bc ]; - buildInputs = [ cargo rustc glib xulrunner zip npapi_sdk ]; + buildInputs = [ cargo rustc glib firefox-unwrapped zip npapi_sdk ]; preConfigure = '' configureFlagsArray+=("BIN_BASH=${bash}/bin/bash") diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 094416b32af1..816bfcb5e93b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -977,6 +977,7 @@ mapAliases ({ xineLib = xine-lib; # Added 2021-04-27 xineUI = xine-ui; # Added 2021-04-27 xtrt = throw "xtrt has been removed due to being abandoned"; # Added 2023-05-25 + xulrunner = firefox-unwrapped; # Added 2023-11-03 xvfb_run = xvfb-run; # Added 2021-05-07 ### Y ### diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f8e4d22fd626..31c54ffbcbe4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -41670,8 +41670,6 @@ with pkgs; tora = libsForQt5.callPackage ../development/tools/tora { }; - xulrunner = firefox-unwrapped; - xrq = callPackage ../applications/misc/xrq { }; pynitrokey = callPackage ../tools/security/pynitrokey { };