From 9f6de2029204d2c380f503d76f4c96fe5f3fcdbd Mon Sep 17 00:00:00 2001 From: Evils Date: Mon, 17 May 2021 09:38:56 +0200 Subject: [PATCH 1/2] kicad: correctly handle share/metainfo and appdata fixes issue 123299 blindly linking unstable's metainfo resulted in a dangling symlink this is still share/appdata in the stable package so i linked that --- pkgs/applications/science/electronics/kicad/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index 79a044a800c5..770b73c71244 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -257,9 +257,12 @@ stdenv.mkDerivation rec { postInstall = '' mkdir -p $out/share ln -s ${base}/share/applications $out/share/applications - ln -s ${base}/share/metainfo $out/share/metainfo ln -s ${base}/share/icons $out/share/icons ln -s ${base}/share/mime $out/share/mime + '' + optionalString (stable) '' + ln -s ${base}/share/appdata $out/share/appdata + '' + optionalString (!stable) '' + ln -s ${base}/share/metainfo $out/share/metainfo ''; # can't run this for each pname From bed2e8ef2867841f77e52e5a4fee4d000b08fc2e Mon Sep 17 00:00:00 2001 From: Evils Date: Mon, 17 May 2021 09:37:46 +0200 Subject: [PATCH 2/2] kicad-unstable: 2021-05-13 -> 2021-05-16 --- pkgs/applications/science/electronics/kicad/versions.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/science/electronics/kicad/versions.nix b/pkgs/applications/science/electronics/kicad/versions.nix index 5fa9aba64b0a..c30c074a5de1 100644 --- a/pkgs/applications/science/electronics/kicad/versions.nix +++ b/pkgs/applications/science/electronics/kicad/versions.nix @@ -27,14 +27,14 @@ }; "kicad-unstable" = { kicadVersion = { - version = "2021-05-13"; + version = "2021-05-16"; src = { - rev = "8513ca974c28d76d9f74a7dc96601d98e66e87fd"; - sha256 = "1xlj6jwzwxsa14djqhj0csziii21mr9czvdj6fxqp6px84cifjsh"; + rev = "c33b2cfa8d16072b9d1bce558e443c4afa889d06"; + sha256 = "1fvbxjpf880ikjqjhzj8wlxj0845gzrj1yv35rk7akbg4vl9ph72"; }; }; libVersion = { - version = "2021-05-13"; + version = "2021-05-16"; libSources = { i18n.rev = "e89d9a89bec59199c1ade56ee2556591412ab7b0"; i18n.sha256 = "04zaqyhj3qr4ymyd3k5vjpcna64j8klpsygcgjcv29s3rdi8glfl";