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

Commits on Oct 27, 2019

  1. pyside: fix syntax

    @globin
    globin committed Oct 27, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    sassman Sven Kanoldt
    GPG key ID: 3696C99F3E0EAF95
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e535000 View commit details
Showing with 2 additions and 1 deletion.
  1. +1 −1 pkgs/development/python-modules/pyside/default.nix
  2. +1 −0 pkgs/stdenv/generic/setup.sh
2 changes: 1 addition & 1 deletion pkgs/development/python-modules/pyside/default.nix
View file
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ buildPythonPackage rec {

buildInputs = [ mesa ];

makeFlags = [ "QT_PLUGIN_PATH=" + pysideShiboken + "/lib/generatorrunner" ];
makeFlags = [ "QT_PLUGIN_PATH=${pysideShiboken}/lib/generatorrunner" ];

meta = {
description = "LGPL-licensed Python bindings for the Qt cross-platform application and UI framework";
1 change: 1 addition & 0 deletions pkgs/stdenv/generic/setup.sh
View file
Original file line number Diff line number Diff line change
@@ -1028,6 +1028,7 @@ buildPhase() {
SHELL=$SHELL
${makeFlags[@]} ${makeFlagsArray+"${makeFlagsArray[@]}"}
${buildFlags+"${buildFlags[@]}"} ${buildFlagsArray+"${buildFlagsArray[@]}"}
${buildTargets+"${buildTargets[@]}"}
)

echoCmd 'build flags' "${flagsArray[@]}"