From 427edc8b5a45fbf84d9fadc6bfee7b3fab6667dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eduardo=20S=C3=A1nchez=20Mu=C3=B1oz?= Date: Sat, 10 Apr 2021 18:25:08 +0200 Subject: [PATCH 1/2] kicad: include desktop, icon and mime files Fixes https://github.com/NixOS/nixpkgs/issues/106295. --- .../science/electronics/kicad/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index b91b5ad14a9..bf1ce9c542a 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -216,6 +216,8 @@ stdenv.mkDerivation rec { in (concatStringsSep "\n" (flatten [ + "runHook preInstall" + (optionalString (withScripting) "buildPythonPath \"${base} $pythonPath\" \n") # wrap each of the directly usable tools @@ -227,10 +229,19 @@ stdenv.mkDerivation rec { # link in the CLI utils (map (util: "ln -s ${base}/bin/${util} $out/bin/${util}") utils) + + "runHook postInstall" ]) ) ; + postInstall = '' + mkdir -p $out/share + ln -s ${base}/share/applications $out/share/applications + ln -s ${base}/share/icons $out/share/icons + ln -s ${base}/share/mime $out/share/mime + ''; + # can't run this for each pname # stable and unstable are in the same versions.nix # and kicad-small reuses stable From b5c90bb4da054d5f2142d995813045be95d7ea30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eduardo=20S=C3=A1nchez=20Mu=C3=B1oz?= Date: Sat, 10 Apr 2021 20:39:02 +0200 Subject: [PATCH 2/2] kicad: fix license https://kicad.org/about/licenses/ --- pkgs/applications/science/electronics/kicad/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index bf1ce9c542a..76048733a6a 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -259,7 +259,7 @@ stdenv.mkDerivation rec { KiCad is an open source software suite for Electronic Design Automation. The Programs handle Schematic Capture, and PCB Layout with Gerber output. ''; - license = lib.licenses.agpl3; + license = lib.licenses.gpl3Plus; # berce seems inactive... maintainers = with lib.maintainers; [ evils kiwi berce ]; # kicad is cross platform