diff --git a/pkgs/by-name/ru/runit/fix-ar-ranlib.patch b/pkgs/by-name/ru/runit/fix-ar-ranlib.patch index c65a037d5242..02d070c06673 100644 --- a/pkgs/by-name/ru/runit/fix-ar-ranlib.patch +++ b/pkgs/by-name/ru/runit/fix-ar-ranlib.patch @@ -1,5 +1,5 @@ ---- runit-2.1.2/src/print-ar.sh -+++ runit-2.1.2/src/print-ar.sh +--- a/src/print-ar.sh ++++ b/src/print-ar.sh @@ -1,7 +1,7 @@ cat warn-auto.sh echo 'main="$1"; shift' diff --git a/pkgs/by-name/ru/runit/package.nix b/pkgs/by-name/ru/runit/package.nix index b9523760a021..1bd3067e90ea 100644 --- a/pkgs/by-name/ru/runit/package.nix +++ b/pkgs/by-name/ru/runit/package.nix @@ -7,13 +7,13 @@ static ? false, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "runit"; version = "2.3.1"; src = fetchurl { - url = "https://smarden.org/runit/${pname}-${version}.tar.gz"; - sha256 = "sha256-Y08jyMTR1EAEO+D+ko3fkEYmKJ6Xv+fFgm6TqvLMb+k="; + url = "https://smarden.org/runit/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; + hash = "sha256-Y08jyMTR1EAEO+D+ko3fkEYmKJ6Xv+fFgm6TqvLMb+k="; }; patches = [ @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { "man" ]; - sourceRoot = "admin/${pname}-${version}"; + sourceRoot = "admin/${finalAttrs.pname}-${finalAttrs.version}"; doCheck = true; @@ -44,6 +44,8 @@ stdenv.mkDerivation rec { sed -i 's,-static,,g' src/Makefile ''; + enableParallelBuilding = true; + preBuild = '' cd src @@ -66,5 +68,6 @@ stdenv.mkDerivation rec { homepage = "http://smarden.org/runit"; maintainers = [ ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; + mainProgram = "runit"; }; -} +})