MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 23:03:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #35441 from obsidiansystems/android-clean

Browse source 
android sdk, libibert, libbfd: Clean ups
This commit is contained in:
John Ericson 2018-02-24 02:29:24 -05:00 committed by GitHub
commit 30f171d3e2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 48 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/development/libraries/libbfd/default.nix
View file

@ -1,8 +1,10 @@
{ stdenv
, fetchurl, fetchpatch, gnu-config, autoreconfHook264, bison, binutils-raw
{ stdenv, buildPackages
, fetchurl, fetchpatch, gnu-config, autoreconfHook264, bison
, libiberty, zlib
}:
let inherit (buildPackages.buildPackages) binutils-raw; in
stdenv.mkDerivation rec {
name = "libbfd-${version}";
inherit (binutils-raw.bintools) version src;

4
pkgs/development/libraries/libiberty/default.nix
View file

@ -1,4 +1,6 @@
{ stdenv, fetchurl, gcc, staticBuild ? false }:
{ stdenv, buildPackages, fetchurl, staticBuild ? false }:
let inherit (buildPackages.buildPackages) gcc; in
stdenv.mkDerivation rec {
name = "libiberty-${gcc.cc.version}";

2
pkgs/development/mobile/androidenv/androidndk.nix
View file

@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
phases = "buildPhase";
buildInputs = [ p7zip makeWrapper ];
nativeBuildInputs = [ p7zip makeWrapper ];
buildCommand = let
bin_path = "$out/bin";

2
pkgs/development/mobile/androidenv/androidndk_r8e.nix
View file

@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
phases = "buildPhase";
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
buildCommand = let
bin_path = "$out/bin";

20
pkgs/development/mobile/androidenv/default.nix
View file

@ -1,8 +1,10 @@
{pkgs, pkgs_i686, includeSources ? true}:
{ buildPackages, pkgs, pkgs_i686, targetPackages
, includeSources ? true
}:
rec {
platformTools = import ./platform-tools.nix {
inherit (pkgs) stdenv fetchurl unzip zlib;
inherit buildPackages pkgs;
};
buildTools = import ./build-tools.nix {
@ -214,14 +216,20 @@ rec {
};
androidndk = import ./androidndk.nix {
inherit (pkgs) stdenv fetchurl zlib ncurses p7zip lib makeWrapper;
inherit (pkgs) coreutils file findutils gawk gnugrep gnused jdk which;
inherit (buildPackages)
p7zip makeWrapper;
inherit (pkgs)
stdenv fetchurl zlib ncurses lib
coreutils file findutils gawk gnugrep gnused jdk which;
inherit platformTools;
};
androidndk_r8e = import ./androidndk_r8e.nix {
inherit (pkgs) stdenv fetchurl zlib ncurses lib makeWrapper;
inherit (pkgs) coreutils file findutils gawk gnugrep gnused jdk which;
inherit (buildPackages)
makeWrapper;
inherit (pkgs)
stdenv fetchurl zlib ncurses lib
coreutils file findutils gawk gnugrep gnused jdk which;
inherit platformTools;
};

9
pkgs/development/mobile/androidenv/platform-tools.nix
View file

@ -1,4 +1,9 @@
{stdenv, zlib, fetchurl, unzip}:
{ buildPackages, pkgs }:
let
inherit (buildPackages) fetchurl unzip;
inherit (pkgs) stdenv zlib;
in
stdenv.mkDerivation rec {
version = "26.0.2";
@ -42,5 +47,5 @@ stdenv.mkDerivation rec {
done
'';
buildInputs = [ unzip ];
nativeBuildInputs = [ unzip ];
}