diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2015-10-03 14:45:56 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2015-10-03 15:23:13 +0200 |
commit | f361938b210e057906dcdd5471275ddf265e4a4e (patch) | |
tree | ea69e01503464f511e388d36fe69c3c689b42fbc /pkgs/misc | |
parent | f2cb132c34d115761a19728a2a6a595f4fa08761 (diff) | |
parent | b233ecdca68e08940024da6e4e55e6ef2a20863f (diff) | |
download | nixlib-f361938b210e057906dcdd5471275ddf265e4a4e.tar nixlib-f361938b210e057906dcdd5471275ddf265e4a4e.tar.gz nixlib-f361938b210e057906dcdd5471275ddf265e4a4e.tar.bz2 nixlib-f361938b210e057906dcdd5471275ddf265e4a4e.tar.lz nixlib-f361938b210e057906dcdd5471275ddf265e4a4e.tar.xz nixlib-f361938b210e057906dcdd5471275ddf265e4a4e.tar.zst nixlib-f361938b210e057906dcdd5471275ddf265e4a4e.zip |
Merge staging into closure-size
This makes gcc5 the default builder, etc.
Diffstat (limited to 'pkgs/misc')
-rw-r--r-- | pkgs/misc/jackaudio/jack1.nix | 3 | ||||
-rw-r--r-- | pkgs/misc/urbit/default.nix | 42 |
2 files changed, 44 insertions, 1 deletions
diff --git a/pkgs/misc/jackaudio/jack1.nix b/pkgs/misc/jackaudio/jack1.nix index 1c5c78548f5b..4250efcb6a29 100644 --- a/pkgs/misc/jackaudio/jack1.nix +++ b/pkgs/misc/jackaudio/jack1.nix @@ -27,7 +27,8 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ optAlsaLib optDb optLibuuid optLibffado optCelt ]; + buildInputs = [ optAlsaLib optDb optLibffado optCelt ]; + propagatedBuildInputs = [ optLibuuid ]; meta = with stdenv.lib; { description = "JACK audio connection kit"; diff --git a/pkgs/misc/urbit/default.nix b/pkgs/misc/urbit/default.nix new file mode 100644 index 000000000000..e4049f07897a --- /dev/null +++ b/pkgs/misc/urbit/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchgit, gcc, gmp, libsigsegv, openssl, automake, autoconf, ragel, + cmake, re2c, libtool, ncurses, perl, zlib, python }: + +stdenv.mkDerivation rec { + + name = "urbit-${version}"; + version = "2015.09.26"; + + src = fetchgit { + url = "https://github.com/urbit/urbit.git"; + rev = "c9592664c797b2dd74f26886528656f8a7058640"; + sha256 = "0sgrxnmpqh54mgar81wlb6gff8c0pc24p53xwxr448g5shvnzjx9"; + }; + + buildInputs = with stdenv.lib; [ + gcc gmp libsigsegv openssl automake autoconf ragel cmake re2c libtool + ncurses perl zlib python + ]; + + configurePhase = '' + : + ''; + + buildPhase = '' + sed -i 's/-lcurses/-lncurses/' Makefile + mkdir -p $out + cp -r . $out/ + cd $out + make + ''; + + installPhase = '' + : + ''; + + meta = with stdenv.lib; { + description = "an operating function"; + homepage = http://urbit.org/preview/~2015.9.25/materials; + license = licenses.mit; + maintainers = with maintainers; [ mudri ]; + }; +} |