diff --git a/pkgs/development/skaware-packages/s6-rc/default.nix b/pkgs/development/skaware-packages/s6-rc/default.nix index 658f1111b305..1feaf34e8a18 100644 --- a/pkgs/development/skaware-packages/s6-rc/default.nix +++ b/pkgs/development/skaware-packages/s6-rc/default.nix @@ -10,8 +10,8 @@ skawarePackages.buildPackage { pname = "s6-rc"; - version = "0.5.6.0"; - sha256 = "sha256-gSd/aAXo2ZmtKVv5FAqQmUO2h//Ptao8Tv2EsaV0WG4="; + version = "0.6.0.0"; + sha256 = "sha256-RtSmKVnvFgl7hNz7DDsxpv9JqkdtSu7Jxbe94c5oSQE="; manpages = skawarePackages.buildManPages { pname = "s6-rc-man-pages"; @@ -25,18 +25,17 @@ skawarePackages.buildPackage { platforms = lib.platforms.unix; outputs = [ - "bin" - "lib" + # "bin" "lib" + "out" "dev" "doc" - "out" ]; configureFlags = [ - "--libdir=\${lib}/lib" - "--libexecdir=\${lib}/libexec" - "--dynlibdir=\${lib}/lib" - "--bindir=\${bin}/bin" + "--libdir=\${out}/lib" + "--libexecdir=\${out}/libexec" + "--dynlibdir=\${out}/lib" + "--bindir=\${out}/bin" "--includedir=\${dev}/include" "--with-sysdeps=${skalibs.lib}/lib/skalibs/sysdeps" "--with-include=${skalibs.dev}/include" @@ -72,7 +71,7 @@ skawarePackages.buildPackage { postInstall = '' # remove all s6 executables from build directory rm $(find -name "s6-rc-*" -type f -mindepth 1 -maxdepth 1 -executable) - rm s6-rc libs6rc.* + rm s6-rc libs6rc* mv doc $doc/share/doc/s6-rc/html mv examples $doc/share/doc/s6-rc/examples