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

i2p: Add i686-linux platform

Browse Source
This commit is contained in:
shak-mar 2017-06-16 07:59:04 +02:00
parent dda6daa4ff
commit 800139b7fe
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/tools/networking/i2p/default.nix
View File

@ -16,7 +16,19 @@ stdenv.mkDerivation rec {
set -B set -B
mkdir -p $out/{bin,share} mkdir -p $out/{bin,share}
cp -r pkg-temp/* $out cp -r pkg-temp/* $out
'' +
# TODO: Compile wrapper ourselves, see https://geti2p.net/en/misc/manual-wrapper
(if stdenv.system == "i686-linux"
then ''
cp installer/lib/wrapper/linux/* $out
'' else ''
cp installer/lib/wrapper/linux64/* $out cp installer/lib/wrapper/linux64/* $out
'')
# */ # comment end for vim
+ ''
sed -i $out/i2prouter -i $out/runplain.sh \ sed -i $out/i2prouter -i $out/runplain.sh \
-e "s#uname#${coreutils}/bin/uname#" \ -e "s#uname#${coreutils}/bin/uname#" \
-e "s#which#${which}/bin/which#" \ -e "s#which#${which}/bin/which#" \
@ -39,6 +51,6 @@ stdenv.mkDerivation rec {
maintainers = [ maintainers.joelmo ]; maintainers = [ maintainers.joelmo ];
license = licenses.gpl2; license = licenses.gpl2;
# TODO: support other systems, just copy appropriate lib/wrapper.. to $out # TODO: support other systems, just copy appropriate lib/wrapper.. to $out
platforms = [ "x86_64-linux" ]; platforms = [ "x86_64-linux" "i686-linux" ];
}; };
} }