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

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 { stdenv, buildPackages
, fetchurl, fetchpatch, gnu-config, autoreconfHook264, bison, binutils-raw , fetchurl, fetchpatch, gnu-config, autoreconfHook264, bison
, libiberty, zlib , libiberty, zlib
}: }:
let inherit (buildPackages.buildPackages) binutils-raw; in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libbfd-${version}"; name = "libbfd-${version}";
inherit (binutils-raw.bintools) version src; 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 { stdenv.mkDerivation rec {
name = "libiberty-${gcc.cc.version}"; name = "libiberty-${gcc.cc.version}";

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

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

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

@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
phases = "buildPhase"; phases = "buildPhase";
buildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
buildCommand = let buildCommand = let
bin_path = "$out/bin"; 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 { rec {
platformTools = import ./platform-tools.nix { platformTools = import ./platform-tools.nix {
inherit (pkgs) stdenv fetchurl unzip zlib; inherit buildPackages pkgs;
}; };
buildTools = import ./build-tools.nix { buildTools = import ./build-tools.nix {
@ -214,14 +216,20 @@ rec {
}; };
androidndk = import ./androidndk.nix { androidndk = import ./androidndk.nix {
inherit (pkgs) stdenv fetchurl zlib ncurses p7zip lib makeWrapper; inherit (buildPackages)
inherit (pkgs) coreutils file findutils gawk gnugrep gnused jdk which; p7zip makeWrapper;
inherit (pkgs)
stdenv fetchurl zlib ncurses lib
coreutils file findutils gawk gnugrep gnused jdk which;
inherit platformTools; inherit platformTools;
}; };
androidndk_r8e = import ./androidndk_r8e.nix { androidndk_r8e = import ./androidndk_r8e.nix {
inherit (pkgs) stdenv fetchurl zlib ncurses lib makeWrapper; inherit (buildPackages)
inherit (pkgs) coreutils file findutils gawk gnugrep gnused jdk which; makeWrapper;
inherit (pkgs)
stdenv fetchurl zlib ncurses lib
coreutils file findutils gawk gnugrep gnused jdk which;
inherit platformTools; 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 { stdenv.mkDerivation rec {
version = "26.0.2"; version = "26.0.2";
@ -42,5 +47,5 @@ stdenv.mkDerivation rec {
done done
''; '';
buildInputs = [ unzip ]; nativeBuildInputs = [ unzip ];
} }