Merge pull request #326897 from paveloom/ios-webkit-debug-proxy (68725ccd) · Commits · mdf / nixpkgs

pkgs/development/mobile/ios-webkit-debug-proxy/0001-Don-t-compile-examples.patch→pkgs/by-name/io/ios-webkit-debug-proxy/0001-Don-t-compile-examples.patch

+0 −0

File moved.

pkgs/development/mobile/ios-webkit-debug-proxy/default.nix→pkgs/by-name/io/ios-webkit-debug-proxy/package.nix

+83 −0

Original line number	Diff line number	Diff line
		{ stdenv
		, autoconf
		, automake
		, fetchFromGitHub
		, fetchpatch
		, lib
		, libimobiledevice
		, libusb1
		, libplist
		, libtool
		, openssl
		, pkg-config
		{
		lib,
		stdenv,
		fetchFromGitHub,
		fetchpatch,

		autoconf,
		automake,
		libtool,
		pkg-config,

		libimobiledevice,
		libplist,
		libusb1,
		openssl,

		ios-webkit-debug-proxy,
		nix-update-script,
		testers,
		}:

		stdenv.mkDerivation rec {
		stdenv.mkDerivation (finalAttrs: {
		pname = "ios-webkit-debug-proxy";
		version = "1.9.0";
		version = "1.9.1";

		outputs = [
		"out"
		"dev"
		];

		src = fetchFromGitHub {
		owner = "google";
		repo = pname;
		rev = "v${version}";
		hash = "sha256-cZ/p/aWET/BXKDrD+qgR+rfTISd+4jPNQFuV8klSLUo=";
		repo = "ios-webkit-debug-proxy";
		rev = "v${finalAttrs.version}";
		hash = "sha256-94gYTv5v4YNwbiUJ/9PIHU+Bnvf5uN12+oMFWKj+J1Y=";
		};

		patches = [
		# OpenSSL 3.0 compatibility
		(fetchpatch {
		url = "https://github.com/google/ios-webkit-debug-proxy/commit/5ba30a2a67f39d25025cadf37c0eafb2e2d2d0a8.patch";
		hash = "sha256-2b9BjG9wkqO+ZfoBYYJvD2Db5Kr0F/MxKMTRsI0ea3s=";
		})
		(fetchpatch {
		name = "libplist-2.3.0-compatibility.patch";
		url = "https://github.com/google/ios-webkit-debug-proxy/commit/94e4625ea648ece730d33d13224881ab06ad0fce.patch";
		hash = "sha256-2deFAKIcNPDd1loOSe8pWZWs9idIE5Q2+pLkoVQrTLg=";
		})
		# Examples compilation breaks with --disable-static, see https://github.com/google/ios-webkit-debug-proxy/issues/399
		./0001-Don-t-compile-examples.patch
		];

		outputs = [ "out" "dev" ];
		nativeBuildInputs = [
		autoconf
		automake
		libtool
		pkg-config
		];

		nativeBuildInputs = [ autoconf automake libtool pkg-config ];
		buildInputs = [ libimobiledevice libusb1 libplist openssl ];
		buildInputs = [
		libimobiledevice
		libplist
		libusb1
		openssl
		];

		preConfigure = ''
		NOCONFIGURE=1 ./autogen.sh
		@@ -49,9 +60,13 @@ stdenv.mkDerivation rec {

		enableParallelBuilding = true;

		passthru = {
		updateScript = nix-update-script { };
		tests.version = testers.testVersion { package = ios-webkit-debug-proxy; };
		};

		meta = with lib; {
		description = "DevTools proxy (Chrome Remote Debugging Protocol) for iOS devices (Safari Remote Web Inspector)";
		mainProgram = "ios_webkit_debug_proxy";
		longDescription = ''
		The ios_webkit_debug_proxy (aka iwdp) proxies requests from usbmuxd
		daemon over a websocket connection, allowing developers to send commands
		@@ -59,6 +74,10 @@ stdenv.mkDerivation rec {
		'';
		homepage = "https://github.com/google/ios-webkit-debug-proxy";
		license = licenses.bsd3;
		maintainers = [ maintainers.abustany ];
		mainProgram = "ios_webkit_debug_proxy";
		maintainers = with maintainers; [
		abustany
		paveloom
		];
		};
		}
		})

pkgs/top-level/all-packages.nix

+0 −2

Original line number	Diff line number	Diff line
		@@ -3997,8 +3997,6 @@ with pkgs;

		xc = callPackage ../development/tools/xc { };

		ios-webkit-debug-proxy = callPackage ../development/mobile/ios-webkit-debug-proxy { };

		xcodeenv = callPackage ../development/mobile/xcodeenv { };

		xcodes = swiftPackages.callPackage ../development/tools/xcodes {

Admin message