Loading pkgs/by-name/se/sentry-cli/fix-swift-lib-path.patch 0 → 100644 +13 −0 Original line number Diff line number Diff line diff --git a/apple-catalog-parsing/build.rs b/apple-catalog-parsing/build.rs index 2ab4c71b..80301b1a 100644 --- a/apple-catalog-parsing/build.rs +++ b/apple-catalog-parsing/build.rs @@ -30,7 +30,7 @@ fn main() { // Add necessary libraries to the linker search path. Without this line, compiling fails // on systems without Xcode installed (xcode-select is still required). println!( - "cargo:rustc-link-search=native=/Library/Developer/CommandLineTools/usr/lib/swift/macosx" + "cargo:rustc-link-search=native=/usr/lib/swift/macosx" ); let out_dir = env::var("OUT_DIR").expect("OUT_DIR is set for build scripts"); pkgs/by-name/se/sentry-cli/package.nix +17 −1 Original line number Diff line number Diff line Loading @@ -6,6 +6,9 @@ openssl, pkg-config, stdenv, swift, swiftpm, writeShellScriptBin, }: rustPlatform.buildRustPackage rec { pname = "sentry-cli"; Loading @@ -22,11 +25,24 @@ rustPlatform.buildRustPackage rec { # Needed to get openssl-sys to use pkgconfig. OPENSSL_NO_VENDOR = 1; patches = [ ./fix-swift-lib-path.patch ]; buildInputs = [ openssl ]; nativeBuildInputs = [ installShellFiles pkg-config ]; ] ++ (lib.optionals stdenv.hostPlatform.isDarwin [ swift swiftpm (writeShellScriptBin "xcode-select" '' echo $DEVELOPER_DIR '') ]); # By default including `swiftpm` in `nativeBuildInputs` will take over `buildPhase` dontUseSwiftpmBuild = true; cargoHash = "sha256-6AM1oGX4q6kHePiS0fsoXPt0b89O9WItIBukPIwapJQ="; Loading Loading
pkgs/by-name/se/sentry-cli/fix-swift-lib-path.patch 0 → 100644 +13 −0 Original line number Diff line number Diff line diff --git a/apple-catalog-parsing/build.rs b/apple-catalog-parsing/build.rs index 2ab4c71b..80301b1a 100644 --- a/apple-catalog-parsing/build.rs +++ b/apple-catalog-parsing/build.rs @@ -30,7 +30,7 @@ fn main() { // Add necessary libraries to the linker search path. Without this line, compiling fails // on systems without Xcode installed (xcode-select is still required). println!( - "cargo:rustc-link-search=native=/Library/Developer/CommandLineTools/usr/lib/swift/macosx" + "cargo:rustc-link-search=native=/usr/lib/swift/macosx" ); let out_dir = env::var("OUT_DIR").expect("OUT_DIR is set for build scripts");
pkgs/by-name/se/sentry-cli/package.nix +17 −1 Original line number Diff line number Diff line Loading @@ -6,6 +6,9 @@ openssl, pkg-config, stdenv, swift, swiftpm, writeShellScriptBin, }: rustPlatform.buildRustPackage rec { pname = "sentry-cli"; Loading @@ -22,11 +25,24 @@ rustPlatform.buildRustPackage rec { # Needed to get openssl-sys to use pkgconfig. OPENSSL_NO_VENDOR = 1; patches = [ ./fix-swift-lib-path.patch ]; buildInputs = [ openssl ]; nativeBuildInputs = [ installShellFiles pkg-config ]; ] ++ (lib.optionals stdenv.hostPlatform.isDarwin [ swift swiftpm (writeShellScriptBin "xcode-select" '' echo $DEVELOPER_DIR '') ]); # By default including `swiftpm` in `nativeBuildInputs` will take over `buildPhase` dontUseSwiftpmBuild = true; cargoHash = "sha256-6AM1oGX4q6kHePiS0fsoXPt0b89O9WItIBukPIwapJQ="; Loading