diff options
| author | Nick Cao <nickcao@nichi.co> | 2024-02-11 10:07:18 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-11 10:07:18 -0500 |
| commit | 76fbd25b17cb2139b3a3af9dd1641cdfdac0132a (patch) | |
| tree | 10d532bee9f5caa1334ba268008780076319f48f /pkgs/development/tools | |
| parent | b5f7d9a42d0b4c0f8e96c440dbff2e85e08234fe (diff) | |
| parent | 480010b786c1234235726c758e74e0f9e3ad4ae2 (diff) | |
| download | nixlib-76fbd25b17cb2139b3a3af9dd1641cdfdac0132a.tar nixlib-76fbd25b17cb2139b3a3af9dd1641cdfdac0132a.tar.gz nixlib-76fbd25b17cb2139b3a3af9dd1641cdfdac0132a.tar.bz2 nixlib-76fbd25b17cb2139b3a3af9dd1641cdfdac0132a.tar.lz nixlib-76fbd25b17cb2139b3a3af9dd1641cdfdac0132a.tar.xz nixlib-76fbd25b17cb2139b3a3af9dd1641cdfdac0132a.tar.zst nixlib-76fbd25b17cb2139b3a3af9dd1641cdfdac0132a.zip | |
Merge pull request #287987 from bjornfor/stlink-fix-build
Revert "stlink: fix stlink build for macos"
Diffstat (limited to 'pkgs/development/tools')
| -rw-r--r-- | pkgs/development/tools/misc/stlink/default.nix | 8 |
1 files changed, 0 insertions, 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 [ |