nix-community/nix-on-droid
1
0
Fork 0
mirror of https://github.com/nix-community/nix-on-droid.git synced 2025-11-08 11:36:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

treewide: apply nixpkgs-fmt

Browse source
This commit is contained in:
Tobias Happ 2022-09-03 17:10:19 +02:00
parent 241632822a
commit 7d1ed0fbaa
23 changed files with 64 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

8
pkgs/cross-compiling/proot-termux.nix
View file

@ -7,7 +7,7 @@ let
stdenv = pkgsCross.stdenvAdapters.makeStaticBinaries pkgsCross.stdenv;
in
pkgsCross.callPackage ../proot-termux {
talloc = tallocStatic;
inherit stdenv;
}
pkgsCross.callPackage ../proot-termux {
talloc = tallocStatic;
inherit stdenv;
}

2
pkgs/cross-compiling/talloc-static.nix
View file

@ -21,7 +21,7 @@ pkgsCross.stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkg-config python3 wafHook ];
buildInputs = [];
buildInputs = [ ];
wafPath = "./buildtools/bin/waf";
wafConfigureFlags = [

2
pkgs/nix-directory.nix
View file

@ -27,7 +27,7 @@ stdenv.mkDerivation {
sha256 = "179jjf9hy1860d7bsravykg15jqxdfm51fy14aihkjbc1q6knyyx";
};
PROOT_NO_SECCOMP = 1; # see https://github.com/proot-me/PRoot/issues/106
PROOT_NO_SECCOMP = 1; # see https://github.com/proot-me/PRoot/issues/106
buildPhase = ''
mkdir --parents ${buildRootDirectory}/nix

12
pkgs/proot-termux/default.nix
View file

@ -1,7 +1,11 @@
# Copyright (c) 2019-2022, see AUTHORS. Licensed under MIT License, see LICENSE.
{ stdenv, fetchFromGitHub, talloc,
static ? true, outputBinaryName ? "proot-static" }:
{ stdenv
, fetchFromGitHub
, talloc
, static ? true
, outputBinaryName ? "proot-static"
}:
stdenv.mkDerivation {
pname = "proot-termux";
@ -30,8 +34,8 @@ stdenv.mkDerivation {
patches = [ ./detranslate-empty.patch ];
makeFlags = [ "-Csrc" "V=1" ];
CFLAGS = [ "-O3" "-I../fake-ashmem" ] ++
(if static then [ "-static" ] else []);
LDFLAGS = if static then [ "-static" ] else [];
(if static then [ "-static" ] else [ ]);
LDFLAGS = if static then [ "-static" ] else [ ];
preInstall = "${stdenv.cc.targetPrefix}strip src/proot";
installPhase = "install -D -m 0755 src/proot $out/bin/${outputBinaryName}";
}