cmake-2_8: fix for multiple outputs

2016-04-14 01:03:23 +03:00
parent ae7b54d0b4
commit d528c7d8f5
2 changed files with 43 additions and 45 deletions
@@ -58,11 +58,14 @@ stdenv.mkDerivation rec {

  dontUseCmakeConfigure = true;

-  preConfigure = optionalString (stdenv ? glibc)
+  preConfigure = with stdenv; optionalString (stdenv ? glibc)
    ''
      source $setupHook
      fixCmakeFiles .
-      substituteInPlace Modules/Platform/UnixPaths.cmake --subst-var-by glibc ${stdenv.glibc}
+      substituteInPlace Modules/Platform/UnixPaths.cmake \
+        --subst-var-by glibc_bin ${glibc.bin or glibc} \
+        --subst-var-by glibc_dev ${glibc.dev or glibc} \
+        --subst-var-by glibc_lib ${glibc.out or glibc}
    '';

  meta = {