mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-19 23:21:27 +00:00
expresslrs-configurator: 1.7.11 -> 1.8.1
Release notes: https://github.com/ExpressLRS/ExpressLRS-Configurator/releases/tag/v1.8.1 Drop the serialport node_gyp_bins workaround because the path is no longer present in the 1.8.x bundle. Add the C++ runtime library to the wrapper for the updated serialport native module.
This commit is contained in:
@@ -12,7 +12,7 @@
|
||||
|
||||
let
|
||||
pname = "expresslrs-configurator";
|
||||
version = "1.7.11";
|
||||
version = "1.8.1";
|
||||
installPath = "share/${pname}";
|
||||
resourcesPath = "${installPath}/resources";
|
||||
in
|
||||
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
|
||||
src = fetchzip {
|
||||
url = "https://github.com/ExpressLRS/ExpressLRS-Configurator/releases/download/v${version}/${pname}-${version}.zip";
|
||||
stripRoot = false;
|
||||
hash = "sha256-BIbJzNWjYFbbwCEWoym3g6XBpQGi2owbf2XsQiXwHmw=";
|
||||
hash = "sha256-3f2/ifXLs/gHZVVDI0EUBP05FEHH8exDvBzALDXq0Wo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -52,10 +52,6 @@ stdenv.mkDerivation {
|
||||
cp -r $src/locales $src/resources $out/${installPath}/
|
||||
chmod -R u+w $out/${resourcesPath}
|
||||
|
||||
# broken symlink
|
||||
rm -f $out/${resourcesPath}/app.asar.unpacked/node_modules/@serialport/bindings-cpp/build/node_gyp_bins/python3
|
||||
touch $out/${resourcesPath}/app.asar.unpacked/node_modules/@serialport/bindings-cpp/build/node_gyp_bins/python3
|
||||
|
||||
# patch asar absolute paths
|
||||
asar extract $out/${resourcesPath}/app.asar $TMPDIR/app
|
||||
substituteInPlace $TMPDIR/app/dist/main/main.js \
|
||||
@@ -70,6 +66,7 @@ stdenv.mkDerivation {
|
||||
makeWrapper '${lib.getExe electron}' "$out/bin/${pname}" \
|
||||
--add-flags "$out/${resourcesPath}/app.asar" \
|
||||
--prefix PATH : ${lib.makeBinPath [ git ]} \
|
||||
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ (lib.getLib stdenv.cc.cc) ]} \
|
||||
--set ELECTRON_OVERRIDE_DIST_PATH "${electron}/lib/electron" \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto}}"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user