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: d9286030a16b
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 973ba4a2c3c0
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Mar 17, 2019

  1. pythonPackages.pyside: fix build by passing mesa for GL/gl.h 

    (cherry picked from commit 20b0663)
    @7c6f434c @andir
    7c6f434c authored and andir committed Mar 17, 2019
    Copy the full SHA
    973ba4a View commit details
Showing with 3 additions and 2 deletions.
  1. +3 −2 pkgs/development/python-modules/pyside/default.nix
5 changes: 3 additions & 2 deletions pkgs/development/python-modules/pyside/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, fetchurl, cmake, buildPythonPackage, pysideGeneratorrunner, pysideShiboken, qt4 }:
{ lib, fetchurl, cmake, buildPythonPackage, pysideGeneratorrunner, pysideShiboken, qt4, mesa }:

# This derivation provides a Python module and should therefore be called via `python-packages.nix`.
buildPythonPackage rec {
@@ -15,12 +15,13 @@ buildPythonPackage rec {

nativeBuildInputs = [ cmake pysideGeneratorrunner pysideShiboken qt4 ];

buildInputs = [ mesa ];

makeFlags = "QT_PLUGIN_PATH=" + pysideShiboken + "/lib/generatorrunner";

meta = {
description = "LGPL-licensed Python bindings for the Qt cross-platform application and UI framework";
license = lib.licenses.lgpl21;
homepage = http://www.pyside.org;
broken = true;
};
}