From 480010b786c1234235726c758e74e0f9e3ad4ae2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 11 Feb 2024 11:04:18 +0100 Subject: [PATCH] Revert "stlink: fix stlink build for macos" This reverts commit 49dce7182fe550d190b73ede64295c486c1b6763. Remove patch that is included in stlink 1.8.0, and now breaks the build since it cannot be applied again "on top of itself". Fixes: 829148053dbd2458355e8bdd8bc3b2b501fec693 (stlink: 1.7.0 -> 1.8.0) --- pkgs/development/tools/misc/stlink/default.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pkgs/development/tools/misc/stlink/default.nix b/pkgs/development/tools/misc/stlink/default.nix index cb996bcd5729..828def65dfa9 100644 --- a/pkgs/development/tools/misc/stlink/default.nix +++ b/pkgs/development/tools/misc/stlink/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , libusb1 , gtk3 @@ -28,13 +27,6 @@ in stdenv.mkDerivation rec { sha256 = "sha256-hlFI2xpZ4ldMcxZbg/T5/4JuFFdO9THLcU0DQKSFqrw="; }; - patches = [ - (fetchpatch { - url = "https://github.com/stlink-org/stlink/commit/468b1d2daa853b975c33ab69876c486734f2c6a7.diff"; - sha256 = "sha256-ueSi/zc7xbOATl0yBtCL4U64IQ/yqu6sMYDOiPl1JBI="; - }) - ]; - buildInputs = [ libusb1' ] ++ lib.optionals withGUI [