Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: af27dbf1d15d
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5bf6a1341764
Choose a head ref
  • 4 commits
  • 2 files changed
  • 2 contributors

Commits on Mar 24, 2019

  1. pythonPackages.pivy: fix build

    @timor
    timor committed Mar 24, 2019
    Copy the full SHA
    17369ce View commit details

  2. pythonPackages.pysideTools: fix build

    @timor
    timor committed Mar 24, 2019
    Copy the full SHA
    6b8f800 View commit details

  3. pythonPackages.pysideTools: add python deps to propagatedBuildInputs

    @timor
    timor committed Mar 24, 2019
    Copy the full SHA
    de1634a View commit details

  4. Merge pull request #57879 from timor/fix-freecad-build-19.03 

    Fix FreeCAD build 19.03
    @dotlambda
    dotlambda authored Mar 24, 2019
    Copy the full SHA
    5bf6a13 View commit details
Showing with 11 additions and 2 deletions.
  1. +6 −1 pkgs/development/python-modules/pivy/default.nix
  2. +5 −1 pkgs/development/python-modules/pyside/tools.nix
7 changes: 6 additions & 1 deletion pkgs/development/python-modules/pivy/default.nix
View file
Original file line number Diff line number Diff line change
@@ -16,8 +16,13 @@ buildPythonPackage rec {
sha256 = "18n14ha2d3j3ghg2f2aqnf2mks94nn7ma9ii7vkiwcay93zm82cf";
};

nativeBuildInputs = with pkgs; [
swig1 coin3d soqt
];

buildInputs = with pkgs; with xorg; [
swig1 coin3d soqt libGLU_combined
coin3d soqt
libGLU_combined
libXi libXext libSM libICE libX11
];

6 changes: 5 additions & 1 deletion pkgs/development/python-modules/pyside/tools.nix
View file
Original file line number Diff line number Diff line change
@@ -13,7 +13,11 @@ buildPythonPackage rec {

enableParallelBuilding = true;

buildInputs = [ cmake pyside qt4 pysideShiboken ];
nativeBuildInputs = [ cmake ];

buildInputs = [ qt4 ];

propagatedBuildInputs = [ pyside pysideShiboken ];

meta = {
description = "Tools for pyside, the LGPL-licensed Python bindings for the Qt cross-platform application and UI framework";