JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ghc: echo -n mk/build.mk to avoid extra line

Browse Source
This commit is contained in:
John Ericson 2017-09-18 12:04:22 -04:00
parent 5a6b6b4ac5
commit 0eb3acaf38
11 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/compilers/ghc/6.12.3.nix
View File

@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
'';
preConfigure = ''
echo "${buildMK}" > mk/build.mk
echo -n "${buildMK}" > mk/build.mk
'';
configureFlags = [

2
pkgs/development/compilers/ghc/7.0.4.nix
View File

@ -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(|'

2
pkgs/development/compilers/ghc/7.10.3.nix
View File

@ -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}"

2
pkgs/development/compilers/ghc/7.2.2.nix
View File

@ -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(|'

2
pkgs/development/compilers/ghc/7.4.2.nix
View File

@ -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}"

2
pkgs/development/compilers/ghc/7.6.3.nix
View File

@ -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 ''

2
pkgs/development/compilers/ghc/7.8.4.nix
View File

@ -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}"

2
pkgs/development/compilers/ghc/8.0.2.nix
View File

@ -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}"

2
pkgs/development/compilers/ghc/8.2.2.nix
View File

@ -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}"

2
pkgs/development/compilers/ghc/8.4.1.nix
View File

@ -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

2
pkgs/development/compilers/ghc/head.nix
View File

@ -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