diff options
| author | Matt Huszagh <huszaghmatt@gmail.com> | 2020-10-10 16:10:53 -0700 |
|---|---|---|
| committer | Matt Huszagh <huszaghmatt@gmail.com> | 2020-10-12 11:32:44 -0700 |
| commit | f2cb2c447d1b1c4fd48a84e4e9cff21bd1c5b450 (patch) | |
| tree | a29d89b1d17166bd357a60c3c0f913d28a2ba5a8 /pkgs/applications/science/electronics/kicad/base.nix | |
| parent | 9d13164b27ca77ef964b532f524a22a82511542f (diff) | |
kicad: add srcs parameter to allow configuring kicad versions
This also exposes the full src and version parameters for each
derivation, allowing them to overrideable by srcs.
Diffstat (limited to 'pkgs/applications/science/electronics/kicad/base.nix')
| -rw-r--r-- | pkgs/applications/science/electronics/kicad/base.nix | 25 |
1 files changed, 6 insertions, 19 deletions
diff --git a/pkgs/applications/science/electronics/kicad/base.nix b/pkgs/applications/science/electronics/kicad/base.nix index ff6209ee85b6..3d83e905103b 100644 --- a/pkgs/applications/science/electronics/kicad/base.nix +++ b/pkgs/applications/science/electronics/kicad/base.nix @@ -20,11 +20,13 @@ , libXdmcp , fetchpatch , lndir -, callPackages +, callPackage , stable , baseName -, versions +, kicadSrc +, kicadVersion +, i18n , withOCE , opencascade , withOCC @@ -45,28 +47,13 @@ assert stdenv.lib.asserts.assertMsg (!(withOCE && stdenv.isAarch64)) "OCE fails assert stdenv.lib.asserts.assertMsg (!(withOCC && withOCE)) "Only one of OCC and OCE may be enabled"; let - versionConfig = versions.${baseName}; - - libraries = callPackages ./libraries.nix versionConfig.libVersion; - inherit (stdenv.lib) optional optionals; - versionConfig = versions.${baseName}; - libraries = callPackages ./libraries.nix versionConfig.libVersion; in stdenv.mkDerivation rec { - - i18n = libraries.i18n; - pname = "kicad-base"; - version = "${builtins.substring 0 10 versions.${baseName}.kicadVersion.src.rev}"; + version = kicadVersion; - src = fetchFromGitLab ( - { - group = "kicad"; - owner = "code"; - repo = "kicad"; - } // versionConfig.kicadVersion.src - ); + src = kicadSrc; # quick fix for #72248 # should be removed if a a more permanent fix is published |