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

Commits on Mar 26, 2019

  1. python.pkgs.cartopy: fix build (#58361) 

    fallout of #54182

(cherry picked from commit 29cec94)
    @dotlambda
    dotlambda authored and Robert Schütz committed Mar 26, 2019
    Copy the full SHA
    409b46d View commit details
Showing with 10 additions and 3 deletions.
  1. +10 −3 pkgs/development/python-modules/cartopy/default.nix
13 changes: 10 additions & 3 deletions pkgs/development/python-modules/cartopy/default.nix
View file
Original file line number Diff line number Diff line change
@@ -25,12 +25,19 @@ buildPythonPackage rec {
-k "not test_nightshade_image"
'';

buildInputs = [ cython glibcLocales ];
LC_ALL = "en_US.UTF-8";
nativeBuildInputs = [
cython
geos # for geos-config
proj
];

buildInputs = [
geos proj
];

propagatedBuildInputs = [
# required
six pyshp shapely geos proj numpy
six pyshp shapely numpy

# optional
gdal pillow matplotlib pyepsg pykdtree scipy fiona owslib