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

pkgs/tools: stdenv.lib -> lib

Browse Source
This commit is contained in:
Ben Siraphob
2021-01-15 17:12:36 +07:00
parent 94f3683935
commit 8c5d37129f
916 changed files with 2510 additions and 2510 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/system/runit/default.nix
+4 -4
View File
@@ -23,15 +23,15 @@ stdenv.mkDerivation rec {
doCheck = true;
buildInputs = stdenv.lib.optionals static [ stdenv.cc.libc stdenv.cc.libc.static ] ++
stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.libs.utmp;
buildInputs = lib.optionals static [ stdenv.cc.libc stdenv.cc.libc.static ] ++
lib.optional stdenv.isDarwin darwin.apple_sdk.libs.utmp;
postPatch = ''
sed -i "s,\(#define RUNIT\) .*,\1 \"$out/bin/runit\"," src/runit.h
# usernamespace sandbox of nix seems to conflict with runit's assumptions
# about unix users. Therefor skip the check
sed -i '/.\/chkshsgr/d' src/Makefile
'' + stdenv.lib.optionalString (!static) ''
'' + lib.optionalString (!static) ''
sed -i 's,-static,,g' src/Makefile
'';
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
# Both of these are originally hard-coded to gcc
echo ${stdenv.cc.targetPrefix}cc > conf-cc
echo ${stdenv.cc.targetPrefix}cc ${stdenv.lib.optionalString stdenv.isDarwin "-Xlinker -x "}> conf-ld
echo ${stdenv.cc.targetPrefix}cc ${lib.optionalString stdenv.isDarwin "-Xlinker -x "}> conf-ld
'';
installPhase = ''