bitscope: refactored to pass nixpkgs-lint
The linter (nixpkgs-lint) was not able to find the bitscope packages because `recurseIntoAttrs` was not applied to the suite's set. The name supplied to `buildFHSUserEnv` produces a binary that corresponds to the binary names in the deb packages (e.g.: bitscope-dso, bitscope-chart, bitscope-logic, etc), however; this name does not constitute a valid nixpkgs name. Valid nixpkgs names satisfy the `/(.*)(-[0-9].*)$/` pattern, therefore a valid name is merged into the derivation produced by `buildFHSUserEnv`.
This commit is contained in:
parent
3538492f33
commit
b986078593
|
@ -9,7 +9,7 @@
|
||||||
, makeWrapper
|
, makeWrapper
|
||||||
, pango
|
, pango
|
||||||
, stdenv
|
, stdenv
|
||||||
, writeScriptBin
|
, writeTextFile
|
||||||
, xorg
|
, xorg
|
||||||
}:
|
}:
|
||||||
|
|
||||||
|
@ -60,8 +60,11 @@ let
|
||||||
${(wrapBinary libs) attrs.toolName}
|
${(wrapBinary libs) attrs.toolName}
|
||||||
'';
|
'';
|
||||||
});
|
});
|
||||||
|
fhs = target: buildFHSUserEnv {
|
||||||
|
inherit (pkg) name;
|
||||||
|
runScript = target;
|
||||||
|
};
|
||||||
in buildFHSUserEnv {
|
in buildFHSUserEnv {
|
||||||
name = attrs.toolName;
|
name = attrs.toolName;
|
||||||
meta = pkg.meta;
|
|
||||||
runScript = "${pkg.outPath}/bin/${attrs.toolName}";
|
runScript = "${pkg.outPath}/bin/${attrs.toolName}";
|
||||||
}
|
} // { inherit (pkg) meta name; }
|
||||||
|
|
|
@ -88,7 +88,7 @@ in {
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "Mixed signal logic timing and serial protocol analysis software for BitScope";
|
description = "Mixed signal logic timing and serial protocol analysis software for BitScope";
|
||||||
home = "http://bitscope.com/software/logic/";
|
homepage = "http://bitscope.com/software/logic/";
|
||||||
};
|
};
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
|
|
|
@ -14262,7 +14262,8 @@ with pkgs;
|
||||||
|
|
||||||
bitmeter = callPackage ../applications/audio/bitmeter { };
|
bitmeter = callPackage ../applications/audio/bitmeter { };
|
||||||
|
|
||||||
bitscope = callPackage ../applications/science/electronics/bitscope/packages.nix { };
|
bitscope = recurseIntoAttrs
|
||||||
|
(callPackage ../applications/science/electronics/bitscope/packages.nix { });
|
||||||
|
|
||||||
bitwig-studio1 = callPackage ../applications/audio/bitwig-studio/bitwig-studio1.nix {
|
bitwig-studio1 = callPackage ../applications/audio/bitwig-studio/bitwig-studio1.nix {
|
||||||
inherit (gnome2) zenity;
|
inherit (gnome2) zenity;
|
||||||
|
|
Loading…
Reference in a new issue