diff --git a/flake.lock b/flake.lock index eba0dea..d0ade56 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1707205916, - "narHash": "sha256-fmRJilYGlB7VCt3XsdYxrA0u8e/K84O5xYucerUY0iM=", + "lastModified": 1707743206, + "narHash": "sha256-AehgH64b28yKobC/DAWYZWkJBxL/vP83vkY+ag2Hhy4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8cc79aa39bbc6eaedaf286ae655b224c71e02907", + "rev": "2d627a2a704708673e56346fcb13d25344b8eaf3", "type": "github" }, "original": { diff --git a/packages/jlink/default.nix b/packages/jlink/default.nix index 2c8263c..8022624 100644 --- a/packages/jlink/default.nix +++ b/packages/jlink/default.nix @@ -1,6 +1,6 @@ -{ stdenv, lib, fetchurl, autoPatchelfHook, fontconfig, freetype, libusb, libICE -, libSM, ncurses5, udev, libX11, libXext, libXcursor, libXfixes, libXrender -, libXrandr }: +{ stdenv, lib, fetchurl, autoPatchelfHook, fontconfig, freetype, libgcc, libusb +, libICE, libSM, ncurses5, udev, libX11, libXext, libXcursor, libXfixes +, libXrender, libXrandr }: let conf = (lib.importJSON ./version.json).${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); @@ -19,17 +19,18 @@ in stdenv.mkDerivation rec { buildInputs = [ fontconfig freetype - libusb libICE libSM + libX11 + libXcursor + libXext + libXfixes + libXrandr + libXrender + libgcc.lib + libusb ncurses5 udev - libX11 - libXext - libXcursor - libXfixes - libXrender - libXrandr ]; runtimeDependencies = [ udev ]; diff --git a/packages/jlink/version.json b/packages/jlink/version.json index 100f677..e3b53d8 100644 --- a/packages/jlink/version.json +++ b/packages/jlink/version.json @@ -1 +1 @@ -{"x86_64-linux": {"url": "https://www.segger.com/downloads/jlink/JLink_Linux_V794f_x86_64.tgz", "version": "7.94f", "curlOpts": "-d accept_license_agreement=accepted -d submit=Download+software", "hash": "sha256-2fTmSXQjLMZtQ8fJjMuwM2q5NBgckX3f0y4eyTmwIvQ="}, "i686-linux": {"url": "https://www.segger.com/downloads/jlink/JLink_Linux_V794f_i686.tgz", "version": "7.94f", "curlOpts": "-d accept_license_agreement=accepted -d submit=Download+software", "hash": "sha256-bKNzHD/Oy/NEF+tkZNQisTOcUwxBe8grAKJAfB+ePek="}, "armv7l-linux": {"url": "https://www.segger.com/downloads/jlink/JLink_Linux_V794f_arm.tgz", "version": "7.94f", "curlOpts": "-d accept_license_agreement=accepted -d submit=Download+software", "hash": "sha256-LblQSHQOAFoPM0BYHFFh0jSg/z7DHs3ZfsXI1lr3jDI="}, "aarch64-linux": {"url": "https://www.segger.com/downloads/jlink/JLink_Linux_V794f_arm64.tgz", "version": "7.94f", "curlOpts": "-d accept_license_agreement=accepted -d submit=Download+software", "hash": "sha256-xqpR8JjTo0vDmxdXgm0OHT9vjYt7k1PP6t46WUp0Mlc="}} \ No newline at end of file +{"x86_64-linux": {"url": "https://www.segger.com/downloads/jlink/JLink_Linux_V794i_x86_64.tgz", "version": "7.94i", "curlOpts": "-d accept_license_agreement=accepted -d submit=Download+software", "hash": "sha256-4GT3y9sLjulesSnbCqf1g+cNBrveDz3PXvlxX56S2t0="}, "i686-linux": {"url": "https://www.segger.com/downloads/jlink/JLink_Linux_V794i_i686.tgz", "version": "7.94i", "curlOpts": "-d accept_license_agreement=accepted -d submit=Download+software", "hash": "sha256-p2NGscXAo8hO9XYbLSvNF5ZFFOmVxdkjvF1uKYK1MmE="}, "armv7l-linux": {"url": "https://www.segger.com/downloads/jlink/JLink_Linux_V794i_arm.tgz", "version": "7.94i", "curlOpts": "-d accept_license_agreement=accepted -d submit=Download+software", "hash": "sha256-HZdD/EgAYFP7g3rWSV8VEG7EBEPtK0foo3AeH11j3WQ="}, "aarch64-linux": {"url": "https://www.segger.com/downloads/jlink/JLink_Linux_V794i_arm64.tgz", "version": "7.94i", "curlOpts": "-d accept_license_agreement=accepted -d submit=Download+software", "hash": "sha256-V8tkCwXOJZRUejXt7/8Aj+m2856yJM2u90cAxAjM+k8="}} \ No newline at end of file