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

Merge pull request #7065 from pmahoney/skarnet-2015-03-28

Browse Source 
update s6, execline, other skarnet.org
This commit is contained in:
lethalman
2015-03-30 17:57:41 +02:00
parent dc560b5b02 00b57f47c7
commit fed2cf85ec
7 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/servers/s6/default.nix
View File

@@ -2,7 +2,7 @@
let
version = "2.0.1.0";
version = "2.1.3.0";
in stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
src = fetchgit {
url = "git://git.skarnet.org/s6";
rev = "refs/tags/v${version}";
sha256 = "1x7za0b1a2i6xn06grpb5j361s9bl4524bp5mz3zcdg8s9nil50d";
sha256 = "0dnwkdxqjv5awdgwxci1spcx1s13y5s9wd8ccskwv1rymvpgn8b3";
};
dontDisableStatic = true;
@@ -26,7 +26,7 @@ in stdenv.mkDerivation rec {
"--with-lib=${execline}/lib"
"--with-dynlib=${skalibs}/lib"
"--with-dynlib=${execline}/lib"
] ++ stdenv.lib.optional stdenv.isDarwin [ "--disable-shared" ];
] ++ [ (if stdenv.isDarwin then "--disable-shared" else "--enable-shared") ];
preBuild = ''
substituteInPlace "src/daemontools-extras/s6-log.c" \