diff options
| author | Yegor Timoshenko <yegortimoshenko@riseup.net> | 2018-11-05 18:57:28 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-05 18:57:28 +0000 |
| commit | 77dad17ab6c8c1e1ff05a8017df62bee893dc304 (patch) | |
| tree | a41e922076a96e3a7a530c44e7a956e536fcef03 /pkgs/build-support | |
| parent | 5c63ee6216a78d8d99300cdc52adb2207337780f (diff) | |
| parent | cea0e9226f09a7887a82094a06d77809181b615f (diff) | |
| download | nixlib-77dad17ab6c8c1e1ff05a8017df62bee893dc304.tar nixlib-77dad17ab6c8c1e1ff05a8017df62bee893dc304.tar.gz nixlib-77dad17ab6c8c1e1ff05a8017df62bee893dc304.tar.bz2 nixlib-77dad17ab6c8c1e1ff05a8017df62bee893dc304.tar.lz nixlib-77dad17ab6c8c1e1ff05a8017df62bee893dc304.tar.xz nixlib-77dad17ab6c8c1e1ff05a8017df62bee893dc304.tar.zst nixlib-77dad17ab6c8c1e1ff05a8017df62bee893dc304.zip | |
Merge pull request #49725 from pbogdan/chrootenv-strip
chrootenv: strip the binary
Diffstat (limited to 'pkgs/build-support')
3 files changed, 11 insertions, 9 deletions
diff --git a/pkgs/build-support/build-fhs-userenv/chrootenv/default.nix b/pkgs/build-support/build-fhs-userenv/chrootenv/default.nix index 375c30e1e463..70a7a43bd398 100644 --- a/pkgs/build-support/build-fhs-userenv/chrootenv/default.nix +++ b/pkgs/build-support/build-fhs-userenv/chrootenv/default.nix @@ -1,18 +1,15 @@ -{ stdenv, pkgconfig, glib }: +{ stdenv, meson, ninja, pkgconfig, glib }: stdenv.mkDerivation { name = "chrootenv"; + src = ./.; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ meson ninja pkgconfig ]; buildInputs = [ glib ]; - buildCommand = '' - cc ${./chrootenv.c} $(pkg-config --cflags --libs glib-2.0) -o $out - ''; - meta = with stdenv.lib; { description = "Setup mount/user namespace for FHS emulation"; - license = licenses.free; + license = licenses.mit; maintainers = with maintainers; [ yegortimoshenko ]; platforms = platforms.linux; }; diff --git a/pkgs/build-support/build-fhs-userenv/chrootenv/meson.build b/pkgs/build-support/build-fhs-userenv/chrootenv/meson.build new file mode 100644 index 000000000000..6d0770a0dc4a --- /dev/null +++ b/pkgs/build-support/build-fhs-userenv/chrootenv/meson.build @@ -0,0 +1,5 @@ +project('chrootenv', 'c') + +glib = dependency('glib-2.0') + +executable('chrootenv', 'chrootenv.c', dependencies: [glib], install: true) diff --git a/pkgs/build-support/build-fhs-userenv/default.nix b/pkgs/build-support/build-fhs-userenv/default.nix index 2bad200efc4d..707b256cd4b4 100644 --- a/pkgs/build-support/build-fhs-userenv/default.nix +++ b/pkgs/build-support/build-fhs-userenv/default.nix @@ -28,7 +28,7 @@ in runCommand name { passthru = passthru // { env = runCommand "${name}-shell-env" { shellHook = '' - exec ${chrootenv} ${init runScript} "$(pwd)" + exec ${chrootenv}/bin/chrootenv ${init runScript} "$(pwd)" ''; } '' echo >&2 "" @@ -41,7 +41,7 @@ in runCommand name { mkdir -p $out/bin cat <<EOF >$out/bin/${name} #! ${stdenv.shell} - exec ${chrootenv} ${init runScript} "\$(pwd)" "\$@" + exec ${chrootenv}/bin/chrootenv ${init runScript} "\$(pwd)" "\$@" EOF chmod +x $out/bin/${name} ${extraInstallCommands} |