diff options
| author | John Ericson <Ericson2314@Yahoo.com> | 2017-06-03 11:21:03 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-06-22 17:53:53 -0400 |
| commit | 7bdacad8b39568611e84da5aa3b37e4e70641012 (patch) | |
| tree | a280d5d0c086d312d69a36418a0b80d6f18cfecf /pkgs/applications/editors/ed | |
| parent | 05b3c87d9d9df6a8eac118f6d243f5a94649d66a (diff) | |
| download | nixpkgs-7bdacad8b39568611e84da5aa3b37e4e70641012.tar nixpkgs-7bdacad8b39568611e84da5aa3b37e4e70641012.tar.gz nixpkgs-7bdacad8b39568611e84da5aa3b37e4e70641012.tar.bz2 nixpkgs-7bdacad8b39568611e84da5aa3b37e4e70641012.tar.lz nixpkgs-7bdacad8b39568611e84da5aa3b37e4e70641012.tar.xz nixpkgs-7bdacad8b39568611e84da5aa3b37e4e70641012.tar.zst nixpkgs-7bdacad8b39568611e84da5aa3b37e4e70641012.zip | |
ed: Modernize and fix for cross
Diffstat (limited to 'pkgs/applications/editors/ed')
| -rw-r--r-- | pkgs/applications/editors/ed/default.nix | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/pkgs/applications/editors/ed/default.nix b/pkgs/applications/editors/ed/default.nix index ec56667a4ba..053e1d22af3 100644 --- a/pkgs/applications/editors/ed/default.nix +++ b/pkgs/applications/editors/ed/default.nix @@ -1,4 +1,6 @@ -{ fetchurl, stdenv }: +{ stdenv, fetchurl +, buildPlatform, hostPlatform +}: stdenv.mkDerivation rec { name = "ed-${version}"; @@ -28,11 +30,12 @@ stdenv.mkDerivation rec { make: *** [check] Error 127 */ - doCheck = !stdenv.isDarwin; + doCheck = !(hostPlatform.isDarwin || hostPlatform != buildPlatform); - crossAttrs = { - compileFlags = [ "CC=${stdenv.cross.config}-gcc" ]; - }; + configureFlags = if hostPlatform == buildPlatform then null else [ + "--exec-prefix=${stdenv.cc.prefix}" + "CC=${stdenv.cc.prefix}cc" + ]; meta = { description = "An implementation of the standard Unix editor"; |