diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-07-28 13:44:21 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-07-28 17:46:39 +0000 |
commit | cab13e087c80c4e7476bb7df432e2b7deb56563d (patch) | |
tree | f8c7f771072bc7c5453625dfdb80cbd3d2c30fb4 /pkgs/os-specific/linux/sinit/default.nix | |
parent | d9c82ed3044c72cecf01c6ea042489d30914577c (diff) | |
parent | 8ecc61c91a596df7d3293603a9c2384190c1b89a (diff) | |
download | nixpkgs-cab13e087c80c4e7476bb7df432e2b7deb56563d.tar nixpkgs-cab13e087c80c4e7476bb7df432e2b7deb56563d.tar.gz nixpkgs-cab13e087c80c4e7476bb7df432e2b7deb56563d.tar.bz2 nixpkgs-cab13e087c80c4e7476bb7df432e2b7deb56563d.tar.lz nixpkgs-cab13e087c80c4e7476bb7df432e2b7deb56563d.tar.xz nixpkgs-cab13e087c80c4e7476bb7df432e2b7deb56563d.tar.zst nixpkgs-cab13e087c80c4e7476bb7df432e2b7deb56563d.zip |
Merge remote-tracking branch 'nixpkgs/nixos-unstable' into nixpkgs-update
Conflicts: pkgs/applications/graphics/hello-wayland/default.nix pkgs/applications/virtualization/cloud-hypervisor/default.nix pkgs/applications/window-managers/tinywl/default.nix pkgs/applications/window-managers/wayfire/applications.nix pkgs/applications/window-managers/wayfire/default.nix pkgs/applications/window-managers/wayfire/wcm.nix pkgs/applications/window-managers/wayfire/wf-config.nix pkgs/applications/window-managers/wayfire/wf-shell.nix pkgs/development/libraries/wlroots/default.nix pkgs/os-specific/linux/chromium-os/crosvm/default.nix pkgs/os-specific/linux/kernel/common-config.nix pkgs/os-specific/linux/kernel/patches.nix pkgs/os-specific/linux/mdevd/default.nix pkgs/os-specific/linux/s6-linux-init/default.nix pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/os-specific/linux/sinit/default.nix')
-rw-r--r-- | pkgs/os-specific/linux/sinit/default.nix | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/os-specific/linux/sinit/default.nix b/pkgs/os-specific/linux/sinit/default.nix index 71bd887535b..830087013fe 100644 --- a/pkgs/os-specific/linux/sinit/default.nix +++ b/pkgs/os-specific/linux/sinit/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchgit, rcinit ? null, rcshutdown ? null, rcreboot ? null}: +{lib, stdenv, fetchgit, rcinit ? null, rcshutdown ? null, rcreboot ? null}: let s = # Generated upstream information rec { @@ -10,7 +10,7 @@ let rev = "refs/tags/v${version}"; }; buildInputs = [ - (stdenv.lib.getOutput "static" stdenv.cc.libc) + (lib.getOutput "static" stdenv.cc.libc) ]; in stdenv.mkDerivation { @@ -21,16 +21,16 @@ stdenv.mkDerivation { }; makeFlags = ["PREFIX=$(out)"]; preConfigure = "" - + (stdenv.lib.optionalString (rcinit != null) ''sed -re 's@(rcinitcmd[^"]*")[^"]*"@\1${rcinit}"@' -i config.def.h; '') - + (stdenv.lib.optionalString (rcshutdown != null) ''sed -re 's@(rc(reboot|poweroff)cmd[^"]*")[^"]*"@\1${rcshutdown}"@' -i config.def.h; '') - + (stdenv.lib.optionalString (rcreboot != null) ''sed -re 's@(rc(reboot)cmd[^"]*")[^"]*"@\1${rcreboot}"@' -i config.def.h; '') + + (lib.optionalString (rcinit != null) ''sed -re 's@(rcinitcmd[^"]*")[^"]*"@\1${rcinit}"@' -i config.def.h; '') + + (lib.optionalString (rcshutdown != null) ''sed -re 's@(rc(reboot|poweroff)cmd[^"]*")[^"]*"@\1${rcshutdown}"@' -i config.def.h; '') + + (lib.optionalString (rcreboot != null) ''sed -re 's@(rc(reboot)cmd[^"]*")[^"]*"@\1${rcreboot}"@' -i config.def.h; '') ; meta = { inherit (s) version; - description = ''A very minimal Linux init implementation from suckless.org''; - license = stdenv.lib.licenses.mit ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + description = "A very minimal Linux init implementation from suckless.org"; + license = lib.licenses.mit ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; homepage = "https://tools.suckless.org/sinit"; downloadPage = "https://git.suckless.org/sinit"; }; |