diff --git a/pkgs/development/mobile/ios-webkit-debug-proxy/0001-Don-t-compile-examples.patch b/pkgs/by-name/io/ios-webkit-debug-proxy/0001-Don-t-compile-examples.patch similarity index 100% rename from pkgs/development/mobile/ios-webkit-debug-proxy/0001-Don-t-compile-examples.patch rename to pkgs/by-name/io/ios-webkit-debug-proxy/0001-Don-t-compile-examples.patch diff --git a/pkgs/by-name/io/ios-webkit-debug-proxy/package.nix b/pkgs/by-name/io/ios-webkit-debug-proxy/package.nix new file mode 100644 index 000000000000..13ecbb058c06 --- /dev/null +++ b/pkgs/by-name/io/ios-webkit-debug-proxy/package.nix @@ -0,0 +1,83 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + + autoconf, + automake, + libtool, + pkg-config, + + libimobiledevice, + libplist, + libusb1, + openssl, + + ios-webkit-debug-proxy, + nix-update-script, + testers, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "ios-webkit-debug-proxy"; + version = "1.9.1"; + + outputs = [ + "out" + "dev" + ]; + + src = fetchFromGitHub { + owner = "google"; + repo = "ios-webkit-debug-proxy"; + rev = "v${finalAttrs.version}"; + hash = "sha256-94gYTv5v4YNwbiUJ/9PIHU+Bnvf5uN12+oMFWKj+J1Y="; + }; + + patches = [ + # Examples compilation breaks with --disable-static, see https://github.com/google/ios-webkit-debug-proxy/issues/399 + ./0001-Don-t-compile-examples.patch + ]; + + nativeBuildInputs = [ + autoconf + automake + libtool + pkg-config + ]; + + buildInputs = [ + libimobiledevice + libplist + libusb1 + openssl + ]; + + preConfigure = '' + NOCONFIGURE=1 ./autogen.sh + ''; + + 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)"; + longDescription = '' + The ios_webkit_debug_proxy (aka iwdp) proxies requests from usbmuxd + daemon over a websocket connection, allowing developers to send commands + to MobileSafari and UIWebViews on real and simulated iOS devices. + ''; + homepage = "https://github.com/google/ios-webkit-debug-proxy"; + license = licenses.bsd3; + mainProgram = "ios_webkit_debug_proxy"; + maintainers = with maintainers; [ + abustany + paveloom + ]; + }; +}) diff --git a/pkgs/development/mobile/ios-webkit-debug-proxy/default.nix b/pkgs/development/mobile/ios-webkit-debug-proxy/default.nix deleted file mode 100644 index 3b32a1bb9a31..000000000000 --- a/pkgs/development/mobile/ios-webkit-debug-proxy/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ stdenv -, autoconf -, automake -, fetchFromGitHub -, fetchpatch -, lib -, libimobiledevice -, libusb1 -, libplist -, libtool -, openssl -, pkg-config -}: - -stdenv.mkDerivation rec { - pname = "ios-webkit-debug-proxy"; - version = "1.9.0"; - - src = fetchFromGitHub { - owner = "google"; - repo = pname; - rev = "v${version}"; - hash = "sha256-cZ/p/aWET/BXKDrD+qgR+rfTISd+4jPNQFuV8klSLUo="; - }; - - 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 ]; - buildInputs = [ libimobiledevice libusb1 libplist openssl ]; - - preConfigure = '' - NOCONFIGURE=1 ./autogen.sh - ''; - - enableParallelBuilding = true; - - 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 - to MobileSafari and UIWebViews on real and simulated iOS devices. - ''; - homepage = "https://github.com/google/ios-webkit-debug-proxy"; - license = licenses.bsd3; - maintainers = [ maintainers.abustany ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e810e7726d56..66425ef230a9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 {