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: 33e7330440b5
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4e45eab9f76c
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Dec 4, 2018

  1. pythonPackages.python-fontconfig: regenerate sources using cython

    gnidorah committed Dec 4, 2018
    Copy the full SHA
    445f79a View commit details

Commits on Dec 5, 2018

  1. Merge pull request #51513 from gnidorah/python-fontconfig 

    pythonPackages.python-fontconfig: regenerate sources using cython
    @Mic92
    Mic92 authored Dec 5, 2018
    Copy the full SHA
    4e45eab View commit details
Showing with 6 additions and 1 deletion.
  1. +6 −1 pkgs/development/python-modules/python-fontconfig/default.nix
7 changes: 6 additions & 1 deletion pkgs/development/python-modules/python-fontconfig/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, buildPythonPackage, fetchPypi, fontconfig, python, freefont_ttf, makeFontsConf }:
{ lib, buildPythonPackage, fetchPypi, fontconfig, python, cython, freefont_ttf, makeFontsConf }:

let
fontsConf = makeFontsConf {
@@ -14,6 +14,11 @@ in buildPythonPackage rec {
};

buildInputs = [ fontconfig ];
nativeBuildInputs = [ cython ];

preBuild = ''
${python.interpreter} setup.py build_ext -i
'';

checkPhase = ''
export FONTCONFIG_FILE=${fontsConf};