From 9c6a69230dff8131130670b46c4590fb30cf6416 Mon Sep 17 00:00:00 2001 From: Christian Albrecht Date: Thu, 31 Mar 2016 16:57:30 +0200 Subject: zsh: fix configureFlags #14256 commit 97332d3 introduced non expanding $out/etc/zprofile in zshs compiled in PATH. this commit reverts the change so that $out is expanded at configure time. --- pkgs/shells/zsh/default.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index d65b7dc80a8b..fda3e77c61f4 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -21,13 +21,9 @@ stdenv.mkDerivation { buildInputs = [ ncurses pcre ]; - configureFlags = [ - "--enable-maildir-support" - "--enable-multibyte" - "--enable-zprofile=$out/etc/zprofile" - "--with-tcsetpgrp" - "--enable-pcre" - ]; + preConfigure = '' + configureFlags="--enable-maildir-support --enable-multibyte --enable-zprofile=$out/etc/zprofile --with-tcsetpgrp --enable-pcre" + ''; # the zsh/zpty module is not available on hydra # so skip groups Y Z -- cgit 1.4.1