dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Expose Android NDK in the top level expression

Browse Source
This commit is contained in:
Sander van der Burg 2014-09-02 14:11:09 +02:00
parent c8871e0b65
commit ef8220d1bf
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/tools/package-management/disnix/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, dbus_glib, libxml2, libxslt, getopt, nixUnstable, dysnomia, libintlOrEmpty, libiconvOrEmpty }:
stdenv.mkDerivation {
name = "disnix-0.3pre174e883b7b09da822494876d2f297736f33707a7";
name = "disnix-0.3pre24d959b3b37ce285971810245643a7f18cb85fcc";
src = fetchurl {
url = http://hydra.nixos.org/build/11773951/download/4/disnix-0.3pre174e883b7b09da822494876d2f297736f33707a7.tar.gz;
sha256 = "19hdh2mrlyiq1g3z6lnnqqvripmfcdnm18jpm4anp5iarhnwh3y4";
url = http://hydra.nixos.org/build/13612993/download/4/disnix-0.3pre24d959b3b37ce285971810245643a7f18cb85fcc.tar.gz;
sha256 = "0ml8g6h7x79mvv84il9vb9b88kqak9m3yzavmar66i3dvyqr1dwb";
};
buildInputs = [ pkgconfig dbus_glib libxml2 libxslt getopt nixUnstable libintlOrEmpty libiconvOrEmpty dysnomia ];

6
pkgs/tools/package-management/disnix/disnixos/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, disnix, socat, pkgconfig, getopt }:
stdenv.mkDerivation {
name = "disnixos-0.2prebb320d396f93d7062c28d6a54105d8e8196b9d99";
name = "disnixos-0.2prec3310e2d8975c45e4ffacec940049fb781739b8d";
src = fetchurl {
url = http://hydra.nixos.org/build/9877039/download/3/disnixos-0.2preb10c56eeb1be3046645eea90c779e2d64045581f.tar.gz;
sha256 = "1pkpf6vp9q3jjp212lghbs1km8iqh4rm9xa5jm0dqb5ya25f0jf2";
url = http://hydra.nixos.org/build/13617499/download/3/disnixos-0.2prec3310e2d8975c45e4ffacec940049fb781739b8d.tar.gz;
sha256 = "1kcpzzwy9jc1zz700whnp6sc77yp3wxzr935f07jy55ddkl8mdi5";
};
buildInputs = [ socat pkgconfig disnix getopt ];

6
pkgs/tools/package-management/disnix/dysnomia/default.nix
View File

@ -19,10 +19,10 @@ assert enableEjabberdDump -> ejabberd != null;
assert enableMongoDatabase -> mongodb != null;
stdenv.mkDerivation {
name = "dysnomia-0.3pre09cc08f5ffc737d988923bb7329a7ec711badd82";
name = "dysnomia-0.3precf347cbd508f488f115f8961371a3cecf03fd530";
src = fetchurl {
url = http://hydra.nixos.org/build/11407191/download/1/dysnomia-0.3pre09cc08f5ffc737d988923bb7329a7ec711badd82.tar.gz;
sha256 = "1i7yb299bq1z7cy4sk83m5faahj8inh73xn5bi6jcv492zv3kgwz";
url = http://hydra.nixos.org/build/13281061/download/1/dysnomia-0.3precf347cbd508f488f115f8961371a3cecf03fd530.tar.gz;
sha256 = "0xiqpz2c3dh4pbdprvrd7plvq3ipngqbjkwpmbhw1nw90x5rpa2d";
};
preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else "";

2
pkgs/top-level/all-packages.nix
View File

@ -528,7 +528,7 @@ let
pkgs_i686 = pkgsi686Linux;
};
inherit (androidenv) androidsdk_4_1;
inherit (androidenv) androidsdk_4_4 androidndk;
aria2 = callPackage ../tools/networking/aria2 { };
aria = aria2;