diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-11-19 16:49:21 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-11-19 16:51:12 +0100 |
| commit | b9c0b3f126472b144c543d8d77a8047e8d905ada (patch) | |
| tree | 2ad99b8789bcb62b993ed18d2877905f7f02bdac /nixpkgs/pkgs/applications/science/electronics/kicad/base.nix | |
| parent | 67419f0e56f99b0ebbe14574d3492110ac84c8d6 (diff) | |
| parent | c757e9bd77b16ca2e03c89bf8bc9ecb28e0c06ad (diff) | |
| download | nixlib-b9c0b3f126472b144c543d8d77a8047e8d905ada.tar nixlib-b9c0b3f126472b144c543d8d77a8047e8d905ada.tar.gz nixlib-b9c0b3f126472b144c543d8d77a8047e8d905ada.tar.bz2 nixlib-b9c0b3f126472b144c543d8d77a8047e8d905ada.tar.lz nixlib-b9c0b3f126472b144c543d8d77a8047e8d905ada.tar.xz nixlib-b9c0b3f126472b144c543d8d77a8047e8d905ada.tar.zst nixlib-b9c0b3f126472b144c543d8d77a8047e8d905ada.zip | |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs into HEAD
Conflicts: nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/top-level/perl-packages.nix
Diffstat (limited to 'nixpkgs/pkgs/applications/science/electronics/kicad/base.nix')
| -rw-r--r-- | nixpkgs/pkgs/applications/science/electronics/kicad/base.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/applications/science/electronics/kicad/base.nix b/nixpkgs/pkgs/applications/science/electronics/kicad/base.nix index 3403e410cf85..a2e5bbe72a56 100644 --- a/nixpkgs/pkgs/applications/science/electronics/kicad/base.nix +++ b/nixpkgs/pkgs/applications/science/electronics/kicad/base.nix @@ -69,6 +69,8 @@ stdenv.mkDerivation rec { patches = [ # upstream issue 12941 (attempted to upstream, but appreciably unacceptable) ./writable.patch + # https://gitlab.com/kicad/code/kicad/-/issues/15687 + ./runtime_stock_data_path.patch ]; # tagged releases don't have "unknown" |