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

Merge remote-tracking branch 'upstream/staging' into master

Browse Source
This commit is contained in:
Tuomas Tynkkynen
2016-11-30 00:34:23 +02:00
parent 56366b5e66 2587611ed5
commit 8a4d6516ee
102 changed files with 417 additions and 361 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/misc/urbit/default.nix
View File

@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, gcc, gmp, libsigsegv, openssl, automake, autoconf, ragel,
cmake, re2c, libtool, ncurses, perl, zlib, python }:
cmake, re2c, libtool, ncurses, perl, zlib, python2 }:
stdenv.mkDerivation rec {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
buildInputs = with stdenv.lib; [
gcc gmp libsigsegv openssl automake autoconf ragel cmake re2c libtool
ncurses perl zlib python
ncurses perl zlib python2
];
# uses 'readdir_r' deprecated by glibc 2.24