Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 138310d5663b
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 410d794f050d
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 13, 2019

  1. betaflight-configurator: 10.5.1 -> 10.6.0

    @nyanloutre
    nyanloutre committed Oct 13, 2019
    Copy the full SHA
    d849c21 View commit details

Commits on Oct 20, 2019

  1. Merge pull request #71073 from nyanloutre/betaflight_configurator_10_6_0 

    betaflight-configurator: 10.5.1 -> 10.6.0
    @c0bw3b
    c0bw3b authored Oct 20, 2019
    Copy the full SHA
    410d794 View commit details
Showing with 12 additions and 13 deletions.
  1. +12 −13 pkgs/applications/science/robotics/betaflight-configurator/default.nix
25 changes: 12 additions & 13 deletions pkgs/applications/science/robotics/betaflight-configurator/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
{stdenv, fetchurl, unzip, makeDesktopItem, nwjs, wrapGAppsHook, gsettings-desktop-schemas, gtk3 }:

let
strippedName = "betaflight-configurator";
pname = "betaflight-configurator";
desktopItem = makeDesktopItem {
name = strippedName;
exec = strippedName;
icon = "${strippedName}-icon.png";
name = pname;
exec = pname;
icon = pname;
comment = "Betaflight configuration tool";
desktopName = "Betaflight Configurator";
genericName = "Flight controller configuration tool";
};
in
stdenv.mkDerivation rec {
name = "${strippedName}-${version}";
version = "10.5.1";
inherit pname;
version = "10.6.0";
src = fetchurl {
url = "https://github.com/betaflight/betaflight-configurator/releases/download/${version}/${strippedName}_${version}_linux64.zip";
sha256 = "1l4blqgaqfrnydk05q6pwdqdhcly2f8nwzrv0749cqmfiinh8ygc";
url = "https://github.com/betaflight/${pname}/releases/download/${version}/${pname}_${version}_linux64.zip";
sha256 = "09hayzhwangh8b81r038p320vbg0xxlyzrdp9pcmfyxp6s00xslw";
};

nativeBuildInputs = [ wrapGAppsHook ];
@@ -25,14 +25,13 @@ stdenv.mkDerivation rec {

installPhase = ''
mkdir -p $out/bin \
$out/opt/${strippedName} \
$out/share/icons
$out/opt/${pname}
cp -r . $out/opt/${strippedName}/
cp icon/*_icon_128.png $out/share/icons/${strippedName}-icon.png
cp -r . $out/opt/${pname}/
install -m 444 -D icon/bf_icon_128.png $out/share/icons/hicolor/128x128/apps/${pname}.png
cp -r ${desktopItem}/share/applications $out/share/
makeWrapper ${nwjs}/bin/nw $out/bin/${strippedName} --add-flags $out/opt/${strippedName}
makeWrapper ${nwjs}/bin/nw $out/bin/${pname} --add-flags $out/opt/${pname}
'';

meta = with stdenv.lib; {