JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bitscope: refactored to pass nixpkgs-lint

Browse Source 
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:
David Asabina 2018-01-13 13:38:16 +01:00 committed by Bjørn Forsman
parent 3538492f33
commit b986078593
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/applications/science/electronics/bitscope/common.nix
View File

@ -9,7 +9,7 @@
, makeWrapper
, pango
, stdenv
, writeScriptBin
, writeTextFile
, xorg
}:
@ -60,8 +60,11 @@ let
${(wrapBinary libs) attrs.toolName}
'';
});
fhs = target: buildFHSUserEnv {
inherit (pkg) name;
runScript = target;
};
in buildFHSUserEnv {
name = attrs.toolName;
meta = pkg.meta;
runScript = "${pkg.outPath}/bin/${attrs.toolName}";
}
} // { inherit (pkg) meta name; }

2
pkgs/applications/science/electronics/bitscope/packages.nix
View File

@ -88,7 +88,7 @@ in {
meta = {
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 {

3
pkgs/top-level/all-packages.nix
View File

@ -14262,7 +14262,8 @@ with pkgs;
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 {
inherit (gnome2) zenity;