diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-09-18 12:04:22 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-01-21 23:27:38 -0500 |
commit | 0eb3acaf386b15097c8b248c5a50bc7650ef8be9 (patch) | |
tree | 93c7eacfc589644e2fa4c185b7bd373b51cfdfe8 /pkgs/development/compilers/ghc | |
parent | 5a6b6b4ac56f1731abfbc48c7506fecf628a84d7 (diff) | |
download | nixlib-0eb3acaf386b15097c8b248c5a50bc7650ef8be9.tar nixlib-0eb3acaf386b15097c8b248c5a50bc7650ef8be9.tar.gz nixlib-0eb3acaf386b15097c8b248c5a50bc7650ef8be9.tar.bz2 nixlib-0eb3acaf386b15097c8b248c5a50bc7650ef8be9.tar.lz nixlib-0eb3acaf386b15097c8b248c5a50bc7650ef8be9.tar.xz nixlib-0eb3acaf386b15097c8b248c5a50bc7650ef8be9.tar.zst nixlib-0eb3acaf386b15097c8b248c5a50bc7650ef8be9.zip |
ghc: `echo -n` mk/build.mk to avoid extra line
Diffstat (limited to 'pkgs/development/compilers/ghc')
-rw-r--r-- | pkgs/development/compilers/ghc/6.12.3.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/ghc/7.0.4.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/ghc/7.10.3.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/ghc/7.2.2.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/ghc/7.4.2.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/ghc/7.6.3.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/ghc/7.8.4.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/ghc/8.0.2.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/ghc/8.2.2.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/ghc/8.4.1.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/ghc/head.nix | 2 |
11 files changed, 11 insertions, 11 deletions
diff --git a/pkgs/development/compilers/ghc/6.12.3.nix b/pkgs/development/compilers/ghc/6.12.3.nix index 16d6d39e95f4..499508a56f75 100644 --- a/pkgs/development/compilers/ghc/6.12.3.nix +++ b/pkgs/development/compilers/ghc/6.12.3.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; preConfigure = '' - echo "${buildMK}" > mk/build.mk + echo -n "${buildMK}" > mk/build.mk ''; configureFlags = [ diff --git a/pkgs/development/compilers/ghc/7.0.4.nix b/pkgs/development/compilers/ghc/7.0.4.nix index 0f560313007f..665622e075ff 100644 --- a/pkgs/development/compilers/ghc/7.0.4.nix +++ b/pkgs/development/compilers/ghc/7.0.4.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; preConfigure = '' - echo "${buildMK}" > mk/build.mk + echo -n "${buildMK}" > mk/build.mk sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure '' + stdenv.lib.optionalString stdenv.isDarwin '' find . -name '*.hs' | xargs sed -i -e 's|ASSERT (|ASSERT(|' -e 's|ASSERT2 (|ASSERT2(|' -e 's|WARN (|WARN(|' diff --git a/pkgs/development/compilers/ghc/7.10.3.nix b/pkgs/development/compilers/ghc/7.10.3.nix index 376b548b1785..9bf60dfca363 100644 --- a/pkgs/development/compilers/ghc/7.10.3.nix +++ b/pkgs/development/compilers/ghc/7.10.3.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "doc" ]; preConfigure = '' - echo "${buildMK}" > mk/build.mk + echo -n "${buildMK}" > mk/build.mk sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" diff --git a/pkgs/development/compilers/ghc/7.2.2.nix b/pkgs/development/compilers/ghc/7.2.2.nix index 7de33b7b5a54..897b489aa853 100644 --- a/pkgs/development/compilers/ghc/7.2.2.nix +++ b/pkgs/development/compilers/ghc/7.2.2.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ''); preConfigure = '' - echo "${buildMK}" > mk/build.mk + echo -n "${buildMK}" > mk/build.mk sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure '' + stdenv.lib.optionalString stdenv.isDarwin '' find . -name '*.hs' | xargs sed -i -e 's|ASSERT (|ASSERT(|' -e 's|ASSERT2 (|ASSERT2(|' -e 's|WARN (|WARN(|' diff --git a/pkgs/development/compilers/ghc/7.4.2.nix b/pkgs/development/compilers/ghc/7.4.2.nix index 5fb5dabd4381..ebf48c2584d9 100644 --- a/pkgs/development/compilers/ghc/7.4.2.nix +++ b/pkgs/development/compilers/ghc/7.4.2.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ''); preConfigure = '' - echo "${buildMK}" > mk/build.mk + echo -n "${buildMK}" > mk/build.mk sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" diff --git a/pkgs/development/compilers/ghc/7.6.3.nix b/pkgs/development/compilers/ghc/7.6.3.nix index 181d3967fb21..7bf7046ba763 100644 --- a/pkgs/development/compilers/ghc/7.6.3.nix +++ b/pkgs/development/compilers/ghc/7.6.3.nix @@ -50,7 +50,7 @@ in stdenv.mkDerivation rec { ''); preConfigure = '' - echo "${buildMK}" > mk/build.mk + echo -n "${buildMK}" > mk/build.mk sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure '' + stdenv.lib.optionalString stdenv.isLinux '' diff --git a/pkgs/development/compilers/ghc/7.8.4.nix b/pkgs/development/compilers/ghc/7.8.4.nix index 67ab14239938..c17958ce4eff 100644 --- a/pkgs/development/compilers/ghc/7.8.4.nix +++ b/pkgs/development/compilers/ghc/7.8.4.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation (rec { ''); preConfigure = '' - echo "${buildMK}" > mk/build.mk + echo -n "${buildMK}" > mk/build.mk sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix index 51e604190256..e3b168a81662 100644 --- a/pkgs/development/compilers/ghc/8.0.2.nix +++ b/pkgs/development/compilers/ghc/8.0.2.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "man" "doc" ]; preConfigure = '' - echo "${buildMK}" > mk/build.mk + echo -n "${buildMK}" > mk/build.mk sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix index 6eeff74160b4..934e05465c7b 100644 --- a/pkgs/development/compilers/ghc/8.2.2.nix +++ b/pkgs/development/compilers/ghc/8.2.2.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation (rec { postPatch = "patchShebangs ."; preConfigure = '' - echo "${buildMK}" > mk/build.mk + echo -n "${buildMK}" > mk/build.mk sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" diff --git a/pkgs/development/compilers/ghc/8.4.1.nix b/pkgs/development/compilers/ghc/8.4.1.nix index 45e34a775ede..dd0be26da7c7 100644 --- a/pkgs/development/compilers/ghc/8.4.1.nix +++ b/pkgs/development/compilers/ghc/8.4.1.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation (rec { postPatch = "patchShebangs ."; preConfigure = '' - echo "${buildMK}" > mk/build.mk + echo -n "${buildMK}" > mk/build.mk echo ${version} >VERSION echo ${rev} >GIT_COMMIT_ID ./boot diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 18a00202dc2e..6fb199b1a579 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation (rec { postPatch = "patchShebangs ."; preConfigure = '' - echo "${buildMK}" > mk/build.mk + echo -n "${buildMK}" > mk/build.mk echo ${version} >VERSION echo ${rev} >GIT_COMMIT_ID ./boot |