diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-07-05 08:55:26 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-07-05 08:55:26 +0200 |
| commit | 5328aac7be5b7ebf794349f915a379efd04b018b (patch) | |
| tree | 029547f7673a785c42f12770a68a3ec31a297bf9 /pkgs/applications/editors | |
| parent | f203b32bb8e824a75f89fd9805680b4a8e92d2a5 (diff) | |
| parent | c73f0caea5f0822ea044b4f90de4b64706d91362 (diff) | |
| download | nixlib-5328aac7be5b7ebf794349f915a379efd04b018b.tar nixlib-5328aac7be5b7ebf794349f915a379efd04b018b.tar.gz nixlib-5328aac7be5b7ebf794349f915a379efd04b018b.tar.bz2 nixlib-5328aac7be5b7ebf794349f915a379efd04b018b.tar.lz nixlib-5328aac7be5b7ebf794349f915a379efd04b018b.tar.xz nixlib-5328aac7be5b7ebf794349f915a379efd04b018b.tar.zst nixlib-5328aac7be5b7ebf794349f915a379efd04b018b.zip | |
Merge branch 'staging'
Comparison looks OK; I'll try some fixes on master directly. http://hydra.nixos.org/eval/1372577?compare=1372497
Diffstat (limited to 'pkgs/applications/editors')
| -rw-r--r-- | pkgs/applications/editors/ed/default.nix | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/applications/editors/ed/default.nix b/pkgs/applications/editors/ed/default.nix index 053e1d22af31..2404405c307f 100644 --- a/pkgs/applications/editors/ed/default.nix +++ b/pkgs/applications/editors/ed/default.nix @@ -32,7 +32,13 @@ stdenv.mkDerivation rec { */ doCheck = !(hostPlatform.isDarwin || hostPlatform != buildPlatform); - configureFlags = if hostPlatform == buildPlatform then null else [ + # TODO(@Ericson2314): Use placeholder to make this a configure flag once Nix + # 1.12 is released. + preConfigure = '' + export DESTDIR=$out + ''; + + configureFlags = [ "--exec-prefix=${stdenv.cc.prefix}" "CC=${stdenv.cc.prefix}cc" ]; |