Merge branch 'pr-17426' into staging

2016-08-02 09:29:54 -05:00 · 2016-08-02 09:29:54 -05:00 · eab92e6ecd
parent df2102b6a2 5286c0aebb
commit eab92e6ecd
1 changed files with 2 additions and 0 deletions
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@ -50,6 +50,8 @@ stdenv.mkDerivation rec {
        --subst-var-by glibc_bin ${getBin glibc} \
        --subst-var-by glibc_dev ${getDev glibc} \
        --subst-var-by glibc_lib ${getLib glibc}
+      substituteInPlace Modules/FindCxxTest.cmake \
+        --replace "$""{PYTHON_EXECUTABLE}" ${stdenv.shell}
    '';
  configureFlags =
    [ "--docdir=share/doc/${name}"