diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2020-09-10 23:24:26 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-10 23:24:26 -0500 |
| commit | 86d8c55470a0100e98b7c453c1cac16bc560e6f0 (patch) | |
| tree | 5b993e0cc3e13e6f5e6d831f9ab7ef40607a2044 /pkgs/applications/science/electronics/kicad/default.nix | |
| parent | 95eabdfd5f6197c83e9e5f53ddb65dbbea3c13fd (diff) | |
| parent | 61517de024cc9e61c18f2434656c18067a2d68a4 (diff) | |
| download | nixpkgs-86d8c55470a0100e98b7c453c1cac16bc560e6f0.tar nixpkgs-86d8c55470a0100e98b7c453c1cac16bc560e6f0.tar.gz nixpkgs-86d8c55470a0100e98b7c453c1cac16bc560e6f0.tar.bz2 nixpkgs-86d8c55470a0100e98b7c453c1cac16bc560e6f0.tar.lz nixpkgs-86d8c55470a0100e98b7c453c1cac16bc560e6f0.tar.xz nixpkgs-86d8c55470a0100e98b7c453c1cac16bc560e6f0.tar.zst nixpkgs-86d8c55470a0100e98b7c453c1cac16bc560e6f0.zip | |
Merge branch 'staging' into ios-13
Diffstat (limited to 'pkgs/applications/science/electronics/kicad/default.nix')
| -rw-r--r-- | pkgs/applications/science/electronics/kicad/default.nix | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index a99f1b2d8d7..e5ce1f0092e 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, gnome3, pkgs, wxGTK30, wxGTK31 +{ lib, stdenv, gnome3, wxGTK30, wxGTK31 +, makeWrapper , gsettings-desktop-schemas, hicolor-icon-theme , callPackage, callPackages , librsvg, cups @@ -31,9 +32,8 @@ let # but brings high DPI support? else wxGTK31.override { withGtk2 = false; }; - pythonPackages = python.pkgs; python = python3; - wxPython = pythonPackages.wxPython_4_0; + wxPython = python.pkgs.wxPython_4_0; in stdenv.mkDerivation rec { @@ -55,10 +55,11 @@ stdenv.mkDerivation rec { dontFixup = true; pythonPath = optionals (scriptingSupport) - [ wxPython pythonPackages.six ]; + [ wxPython python.pkgs.six ]; - nativeBuildInputs = optionals (scriptingSupport) - [ pythonPackages.wrapPython ]; + nativeBuildInputs = [ makeWrapper ] + ++ optionals (scriptingSupport) + [ python.pkgs.wrapPython ]; # wrapGAppsHook added the equivalent to ${base}/share # though i noticed no difference without it |