From 468a5bc22458f7aeb3ee7b887f29a8e8799c6337 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 15 Oct 2016 18:03:42 -0400 Subject: [PATCH] dgal: fix --- pkgs/development/libraries/gdal/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index d710c7357bc..ce3e0f61972 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -39,16 +39,9 @@ composableDerivation.composableDerivation {} (fixed: rec { (if netcdfSupport then "--with-netcdf=${netcdf}" else "") ]; - # Prevent this: - # - # Checking .pth file support in /nix/store/xkrmb8xnvqxzjwsdmasqmsdh1a5y2y99-gdal-1.11.2/lib/python2.7/site-packages/ - # /nix/store/pbi1lgank10fy0xpjckbdpgacqw34dsz-python-2.7.9/bin/python -E -c pass - # TEST FAILED: /nix/store/xkrmb8xnvqxzjwsdmasqmsdh1a5y2y99-gdal-1.11.2/lib/python2.7/site-packages/ does NOT support .pth files - # error: bad install directory or PYTHONPATH preBuild = '' - pythonInstallDir=$out/lib/${pythonPackages.python.libPrefix}/site-packages - mkdir -p $pythonInstallDir - export PYTHONPATH=''${PYTHONPATH:+''${PYTHONPATH}:}$pythonInstallDir + substituteInPlace swig/python/GNUmakefile \ + --replace "ifeq (\$(STD_UNIX_LAYOUT),\"TRUE\")" "ifeq (1,1)" ''; postInstall = ''