ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-25 12:22:37 +03:00
Code Issues Projects Releases Wiki Activity

chrootenv: use meson

Browse Source
This commit is contained in:
Yegor Timoshenko 2018-11-04 11:33:34 +00:00
parent ccb76eeb3c
commit cea0e9226f
No known key found for this signature in database
GPG Key ID: B0B0D739BB47A03A
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/build-support/build-fhs-userenv/chrootenv/default.nix
View File

@ -1,19 +1,15 @@
{ stdenv, pkgconfig, glib }: { stdenv, meson, ninja, pkgconfig, glib }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "chrootenv"; name = "chrootenv";
src = ./.;
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ meson ninja pkgconfig ];
buildInputs = [ glib ]; buildInputs = [ glib ];
buildCommand = ''
cc ${./chrootenv.c} $(pkg-config --cflags --libs glib-2.0) -o $out
${stdenv.cc.bintools.bintools}/bin/strip $out
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Setup mount/user namespace for FHS emulation"; description = "Setup mount/user namespace for FHS emulation";
license = licenses.free; license = licenses.mit;
maintainers = with maintainers; [ yegortimoshenko ]; maintainers = with maintainers; [ yegortimoshenko ];
platforms = platforms.linux; platforms = platforms.linux;
}; };

5
pkgs/build-support/build-fhs-userenv/chrootenv/meson.build Normal file
View File

@ -0,0 +1,5 @@
project('chrootenv', 'c')
glib = dependency('glib-2.0')
executable('chrootenv', 'chrootenv.c', dependencies: [glib], install: true)

4
pkgs/build-support/build-fhs-userenv/default.nix
View File

@ -28,7 +28,7 @@ in runCommand name {
passthru = passthru // { passthru = passthru // {
env = runCommand "${name}-shell-env" { env = runCommand "${name}-shell-env" {
shellHook = '' shellHook = ''
exec ${chrootenv} ${init runScript} "$(pwd)" exec ${chrootenv}/bin/chrootenv ${init runScript} "$(pwd)"
''; '';
} '' } ''
echo >&2 "" echo >&2 ""
@ -41,7 +41,7 @@ in runCommand name {
mkdir -p $out/bin mkdir -p $out/bin
cat <<EOF >$out/bin/${name} cat <<EOF >$out/bin/${name}
#! ${stdenv.shell} #! ${stdenv.shell}
exec ${chrootenv} ${init runScript} "\$(pwd)" "\$@" exec ${chrootenv}/bin/chrootenv ${init runScript} "\$(pwd)" "\$@"
EOF EOF
chmod +x $out/bin/${name} chmod +x $out/bin/${name}
${extraInstallCommands} ${extraInstallCommands}