diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-11-29 10:00:30 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-11-29 10:02:40 +0100 |
| commit | 5f020d5627789ce77b2997e360ece984c261bce7 (patch) | |
| tree | ad2398b7aadcb52e5ef02df8dd961874edb7c816 /pkgs/applications/editors | |
| parent | 0e6ca9e85d76ddb2757d05119f07f4b2fe32b689 (diff) | |
| parent | 8b53b2ec2c7ec4d87b8d27df7fe0c85812e29bf5 (diff) | |
| download | nixlib-5f020d5627789ce77b2997e360ece984c261bce7.tar nixlib-5f020d5627789ce77b2997e360ece984c261bce7.tar.gz nixlib-5f020d5627789ce77b2997e360ece984c261bce7.tar.bz2 nixlib-5f020d5627789ce77b2997e360ece984c261bce7.tar.lz nixlib-5f020d5627789ce77b2997e360ece984c261bce7.tar.xz nixlib-5f020d5627789ce77b2997e360ece984c261bce7.tar.zst nixlib-5f020d5627789ce77b2997e360ece984c261bce7.zip | |
Merge branch 'staging'
There are security fixes in multiple packages /cc #32117, so I'm merging a little earlier, with a few thousand jobs still not finished on Hydra for x86_64-darwin and aarch64-linux.
Diffstat (limited to 'pkgs/applications/editors')
| -rw-r--r-- | pkgs/applications/editors/ed/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/editors/ed/default.nix b/pkgs/applications/editors/ed/default.nix index 9d5848f02637..ee5afe500efe 100644 --- a/pkgs/applications/editors/ed/default.nix +++ b/pkgs/applications/editors/ed/default.nix @@ -29,8 +29,8 @@ stdenv.mkDerivation rec { installFlags = [ "DESTDIR=$(out)" ]; configureFlags = [ - "--exec-prefix=${stdenv.cc.prefix}" - "CC=${stdenv.cc.prefix}cc" + "--exec-prefix=${stdenv.cc.targetPrefix}" + "CC=${stdenv.cc.targetPrefix}cc" ]; meta = { |