diff --git a/default.nix b/default.nix index 97197b0de26f5f3d30ee11549fec313a716ac219..2d1d411920397e48412ec72a237c614afe6bcabf 100644 --- a/default.nix +++ b/default.nix @@ -4,7 +4,6 @@ let in with pkgs; let - openocd = callPackage ./openocd.nix {}; rust = rustChannelOfTargets "nightly" null [ "thumbv7em-none-eabi" ]; rustPlatform = makeRustPlatform { rustc = rust; diff --git a/openocd.nix b/openocd.nix deleted file mode 100644 index dcad7ece56610bd88f2a1e63bcc453949226bcd5..0000000000000000000000000000000000000000 --- a/openocd.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, makeWrapper, openocd, fetchFromGitHub, autoreconfHook, git, which }: -let - maxim-openocd = openocd.overrideAttrs (oa: { - name = "maxim-openocd"; - src = fetchFromGitHub { - owner = "maximmbed"; - repo = "openocd"; - rev = "e71ac88c9dbfa4ee1405d7a86376119dcc887ed1"; - sha256 = "18yc1wyclmjxqg6jilfcm60hi01pgqc4dilsmksqbhg23m6x4ycw"; - fetchSubmodules = true; - }; - nativeBuildInputs = oa.nativeBuildInputs ++ [ - autoreconfHook - git - which - ]; - enableParallelBuilding = true; - }); - card10-scripts = stdenv.mkDerivation { - name = "card10-scripts"; - src = ./c/openocd/scripts; - dontBuild = true; - installPhase = '' - mkdir -p $out/share/openocd - cp -ar . $out/share/openocd/scripts - ''; - }; -in - stdenv.mkDerivation { - name = "openocd-card10"; - src = maxim-openocd; - phases = [ "unpackPhase" "installPhase" ]; - buildInputs = [ makeWrapper maxim-openocd card10-scripts ]; - installPhase = '' - mkdir -p $out/bin - makeWrapper ${maxim-openocd}/bin/openocd $out/bin/openocd-card10 \ - --add-flags "-f ${card10-scripts}/share/openocd/scripts/interface/cmsis-dap.cfg" \ - --add-flags "-f ${card10-scripts}/share/openocd/scripts/target/max32665.cfg" - ''; - } diff --git a/shell.nix b/shell.nix index 31788c58526ce220f6bc030b8ebcd390e39238fd..48bcea54448439ce98194bee4a8708f50554c954 100644 --- a/shell.nix +++ b/shell.nix @@ -10,7 +10,6 @@ stdenv.mkDerivation { glibc_multi rust pkgsCross.arm-embedded.stdenv.cc - openocd ]; LIBCLANG_PATH="${llvmPackages.libclang}/lib";