Merge pull request #223411 from apraga/kent-with-include
Kent: add headers to the package
This commit is contained in:
commit
33f9eb206e
1 changed files with 12 additions and 12 deletions
|
@ -43,22 +43,22 @@ stdenv.mkDerivation rec {
|
||||||
export CFLAGS="-fPIC"
|
export CFLAGS="-fPIC"
|
||||||
export MYSQLINC=$(mysql_config --include | sed -e 's/^-I//g')
|
export MYSQLINC=$(mysql_config --include | sed -e 's/^-I//g')
|
||||||
export MYSQLLIBS=$(mysql_config --libs)
|
export MYSQLLIBS=$(mysql_config --libs)
|
||||||
export DESTBINDIR=$NIX_BUILD_TOP/bin
|
export HOME=$TMPDIR
|
||||||
export HOME=$NIX_BUILD_TOP
|
export DESTBINDIR=$HOME/bin
|
||||||
|
|
||||||
|
mkdir -p $HOME/lib $HOME/bin/x86_64
|
||||||
|
|
||||||
cd ./src
|
cd ./src
|
||||||
chmod +x ./checkUmask.sh
|
chmod +x ./checkUmask.sh
|
||||||
./checkUmask.sh
|
./checkUmask.sh
|
||||||
|
|
||||||
mkdir -p $NIX_BUILD_TOP/lib
|
|
||||||
mkdir -p $NIX_BUILD_TOP/bin/x86_64
|
|
||||||
|
|
||||||
make libs
|
make libs
|
||||||
cd jkOwnLib
|
cd jkOwnLib
|
||||||
make
|
make
|
||||||
|
|
||||||
cp ../lib/x86_64/jkOwnLib.a $NIX_BUILD_TOP/lib
|
cp ../lib/x86_64/jkOwnLib.a $HOME/lib
|
||||||
cp ../lib/x86_64/jkweb.a $NIX_BUILD_TOP/lib
|
cp ../lib/x86_64/jkweb.a $HOME/lib
|
||||||
|
cp -r ../inc $HOME/
|
||||||
|
|
||||||
cd ../utils
|
cd ../utils
|
||||||
make
|
make
|
||||||
|
@ -69,11 +69,11 @@ stdenv.mkDerivation rec {
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
runHook preInstall
|
runHook preInstall
|
||||||
|
|
||||||
mkdir -p $out/bin
|
mkdir -p $out/bin $out/lib $out/inc
|
||||||
mkdir -p $out/lib
|
cp $HOME/lib/jkOwnLib.a $out/lib
|
||||||
cp $NIX_BUILD_TOP/lib/jkOwnLib.a $out/lib
|
cp $HOME/lib/jkweb.a $out/lib
|
||||||
cp $NIX_BUILD_TOP/lib/jkweb.a $out/lib
|
cp $HOME/bin/x86_64/* $out/bin
|
||||||
cp $NIX_BUILD_TOP/bin/x86_64/* $out/bin
|
cp -r $HOME/inc/* $out/inc/
|
||||||
|
|
||||||
runHook postInstall
|
runHook postInstall
|
||||||
'';
|
'';
|
||||||
|
|
Loading…
Reference in a new issue