diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2021-01-19 13:50:04 +0100 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2021-01-19 13:50:04 +0100 |
commit | fc7bd322dfcd204ce6daa95285ff358999ff9a8d (patch) | |
tree | 152ad62f3f30148a64a247fc583af45c80cab40c /pkgs/development/python-modules/wxPython | |
parent | 2d91ad963fe799fce74cf52d8d9ea2d4bc963a93 (diff) | |
parent | 1d26caa746f7eda613c5e87342889e55b9e5ba96 (diff) | |
download | nixpkgs-fc7bd322dfcd204ce6daa95285ff358999ff9a8d.tar nixpkgs-fc7bd322dfcd204ce6daa95285ff358999ff9a8d.tar.gz nixpkgs-fc7bd322dfcd204ce6daa95285ff358999ff9a8d.tar.bz2 nixpkgs-fc7bd322dfcd204ce6daa95285ff358999ff9a8d.tar.lz nixpkgs-fc7bd322dfcd204ce6daa95285ff358999ff9a8d.tar.xz nixpkgs-fc7bd322dfcd204ce6daa95285ff358999ff9a8d.tar.zst nixpkgs-fc7bd322dfcd204ce6daa95285ff358999ff9a8d.zip |
Merge branch 'staging-next' into staging
Diffstat (limited to 'pkgs/development/python-modules/wxPython')
-rw-r--r-- | pkgs/development/python-modules/wxPython/3.0.nix | 4 | ||||
-rw-r--r-- | pkgs/development/python-modules/wxPython/4.0.nix | 4 | ||||
-rw-r--r-- | pkgs/development/python-modules/wxPython/4.1.nix | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/python-modules/wxPython/3.0.nix b/pkgs/development/python-modules/wxPython/3.0.nix index dc15c1c01be..6649c5f6931 100644 --- a/pkgs/development/python-modules/wxPython/3.0.nix +++ b/pkgs/development/python-modules/wxPython/3.0.nix @@ -6,7 +6,7 @@ , libX11 , wxGTK , wxmac -, pkgconfig +, pkg-config , buildPythonPackage , pyopengl , isPy3k @@ -35,7 +35,7 @@ buildPythonPackage rec { hardeningDisable = [ "format" ]; - nativeBuildInputs = [ pkgconfig ] + nativeBuildInputs = [ pkg-config ] ++ (lib.optionals (!stdenv.isDarwin) [ wxGTK libX11 ]) ++ (lib.optionals stdenv.isDarwin [ wxmac ]); diff --git a/pkgs/development/python-modules/wxPython/4.0.nix b/pkgs/development/python-modules/wxPython/4.0.nix index a1cee317e34..d72d4aa35d4 100644 --- a/pkgs/development/python-modules/wxPython/4.0.nix +++ b/pkgs/development/python-modules/wxPython/4.0.nix @@ -2,7 +2,7 @@ , stdenv , buildPythonPackage , fetchPypi -, pkgconfig +, pkg-config , which , cairo , pango @@ -34,7 +34,7 @@ buildPythonPackage rec { doCheck = false; - nativeBuildInputs = [ pkgconfig which doxygen ] + nativeBuildInputs = [ pkg-config which doxygen ] ++ (if stdenv.isDarwin then [ wxmac ] else [ wxGTK ]); buildInputs = [ ncurses libintl ] diff --git a/pkgs/development/python-modules/wxPython/4.1.nix b/pkgs/development/python-modules/wxPython/4.1.nix index 6d07f8b5e28..e4cb6ec79e0 100644 --- a/pkgs/development/python-modules/wxPython/4.1.nix +++ b/pkgs/development/python-modules/wxPython/4.1.nix @@ -3,7 +3,7 @@ , fetchPypi , buildPythonPackage , which -, pkgconfig +, pkg-config , python , isPy27 , pyopengl @@ -30,7 +30,7 @@ buildPythonPackage rec { # https://github.com/wxWidgets/Phoenix/issues/1316 doCheck = false; - nativeBuildInputs = [ which doxygen wxGTK pkgconfig ]; + nativeBuildInputs = [ which doxygen wxGTK pkg-config ]; buildInputs = [ wxGTK.gtk |