Use JLink's own qt4
This commit is contained in:
parent
e58e90a2d2
commit
016cf1deb2
4
externals/packages/jlink/default.nix
vendored
4
externals/packages/jlink/default.nix
vendored
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, lib, fetchurl, autoPatchelfHook, substituteAll, qt4, fontconfig
|
||||
{ stdenv, lib, fetchurl, autoPatchelfHook, fontconfig
|
||||
, freetype, libusb, libICE, libSM, ncurses5, udev, libX11, libXext, libXcursor
|
||||
, libXfixes, libXrender, libXrandr }:
|
||||
let
|
||||
|
@ -17,7 +17,6 @@ in stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [ autoPatchelfHook ];
|
||||
buildInputs = [
|
||||
qt4
|
||||
fontconfig
|
||||
freetype
|
||||
libusb
|
||||
|
@ -39,7 +38,6 @@ in stdenv.mkDerivation rec {
|
|||
mkdir -p $out/{JLink,bin}
|
||||
cp -R * $out/JLink
|
||||
ln -s $out/JLink/J* $out/bin/
|
||||
rm -r $out/JLink/libQt*
|
||||
install -D -t $out/lib/udev/rules.d 99-jlink.rules
|
||||
'';
|
||||
|
||||
|
|
2
externals/packages/jlink/update.py
vendored
2
externals/packages/jlink/update.py
vendored
|
@ -1,5 +1,5 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#! nix-shell -i python3 -p "python3.withPackages (ps: with ps; [ beautifulsoup4 requests ] )" nix-prefetch
|
||||
#! nix-shell -i python3 -p "python3.withPackages (ps: with ps; [ beautifulsoup4 requests lxml ] )" nix-prefetch
|
||||
import requests
|
||||
import bs4
|
||||
import json
|
||||
|
|
2
externals/packages/jlink/version.json
vendored
2
externals/packages/jlink/version.json
vendored
|
@ -1 +1 @@
|
|||
{"x86_64-linux": {"url": "https://www.segger.com/downloads/jlink/JLink_Linux_V784d_x86_64.tgz", "version": "7.84d", "curlOpts": "-d accept_license_agreement=accepted -d submit=Download+software", "hash": "sha256-DdnqEV7Me+FnND2jPfxVrs/Q3n8tnAvi+D5EaI8qpfM="}, "i686-linux": {"url": "https://www.segger.com/downloads/jlink/JLink_Linux_V784d_i686.tgz", "version": "7.84d", "curlOpts": "-d accept_license_agreement=accepted -d submit=Download+software", "hash": "sha256-yO/UAOp64vGgOkWNA+0SkTaZz4KnJ+NskrKgZrDWheM="}, "armv7l-linux": {"url": "https://www.segger.com/downloads/jlink/JLink_Linux_V784d_arm.tgz", "version": "7.84d", "curlOpts": "-d accept_license_agreement=accepted -d submit=Download+software", "hash": "sha256-WBsGufozdmhdMFVs6Y2UNE4+A+hxYClHcjE7E5lQ4TM="}, "aarch64-linux": {"url": "https://www.segger.com/downloads/jlink/JLink_Linux_V784d_arm64.tgz", "version": "7.84d", "curlOpts": "-d accept_license_agreement=accepted -d submit=Download+software", "hash": "sha256-4RHMbLPAHRi6cxSZNtlSMN8svpnenSZrPCHPd6KWQIc="}}
|
||||
{"x86_64-linux": {"url": "https://www.segger.com/downloads/jlink/JLink_Linux_V792d_x86_64.tgz", "version": "7.92d", "curlOpts": "-d accept_license_agreement=accepted -d submit=Download+software", "hash": "sha256-G46nq135PAp4xYu1BJEtgZ1bF+n2DsaHPMmbOXHdvgY="}, "i686-linux": {"url": "https://www.segger.com/downloads/jlink/JLink_Linux_V792d_i686.tgz", "version": "7.92d", "curlOpts": "-d accept_license_agreement=accepted -d submit=Download+software", "hash": "sha256-Neh1ifv3l3mpmxFvH4FEj5T6bnn5LuafRO9CVtA0fww="}, "armv7l-linux": {"url": "https://www.segger.com/downloads/jlink/JLink_Linux_V792d_arm.tgz", "version": "7.92d", "curlOpts": "-d accept_license_agreement=accepted -d submit=Download+software", "hash": "sha256-Lp3ffshRbB5dzgei4dyxlH5iyDTrDwR/yNq4NigVajg="}, "aarch64-linux": {"url": "https://www.segger.com/downloads/jlink/JLink_Linux_V792d_arm64.tgz", "version": "7.92d", "curlOpts": "-d accept_license_agreement=accepted -d submit=Download+software", "hash": "sha256-XacF5u7LF1a50eYJ5czUIQ+bjbmfZXu3XjxrWZwPPNw="}}
|
24
flake.lock
24
flake.lock
|
@ -253,11 +253,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1693399033,
|
||||
"narHash": "sha256-yXhiMo8MnE86sGtPIHAKaLHhmhe8v9tqGGotlUgKJvY=",
|
||||
"lastModified": 1694134858,
|
||||
"narHash": "sha256-fG/ESauOGmiojKlpJG8gB62dJa5Wd+ZIuiDMKK/HD3g=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "f5c15668f9842dd4d5430787d6aa8a28a07f7c10",
|
||||
"rev": "19c6a4081b14443420358262f8416149bd79561a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -295,11 +295,11 @@
|
|||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1692952286,
|
||||
"narHash": "sha256-TsrtPv3+Q1KR0avZxpiJH+b6fX/R/hEQVHbjl1ebotY=",
|
||||
"lastModified": 1693718952,
|
||||
"narHash": "sha256-+nGdJlgTk0MPN7NygopipmyylVuAVi7OItIwTlwtGnw=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "817e297fc3352fadc15f2c5306909aa9192d7d97",
|
||||
"rev": "793de77d9f83418b428e8ba70d1e42c6507d0d35",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -310,11 +310,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1693377291,
|
||||
"narHash": "sha256-vYGY9bnqEeIncNarDZYhm6KdLKgXMS+HA2mTRaWEc80=",
|
||||
"lastModified": 1694183432,
|
||||
"narHash": "sha256-YyPGNapgZNNj51ylQMw9lAgvxtM2ai1HZVUu3GS8Fng=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "e7f38be3775bab9659575f192ece011c033655f0",
|
||||
"rev": "db9208ab987cdeeedf78ad9b4cf3c55f5ebd269b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -366,11 +366,11 @@
|
|||
"pre-commit-hooks": "pre-commit-hooks"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1693862861,
|
||||
"narHash": "sha256-+ynDsujluFf187KZvyBZ1C/BTty3TtKWuzuvpQ7sy/Q=",
|
||||
"lastModified": 1694274712,
|
||||
"narHash": "sha256-XoqfgaqzvS9FS2Ci2NXEPkuY5Shc3Z4RACEeJrWDSsI=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixvim",
|
||||
"rev": "b7611f74a9b1107e09925664f652b141926b0b92",
|
||||
"rev": "6efbb5353c08e6bcee24f3ed7314e51767a52d9e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
Loading…
Reference in a new issue