diff options
| author | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2015-08-23 13:36:47 +0300 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-10-03 14:08:55 +0200 |
| commit | 1ac0e05f69674839d0a3478d8dd776caccca9b04 (patch) | |
| tree | c96e0c897bf6ff0fa6f047b24f26442e922d05a7 /nixos | |
| parent | cd3088455d518b4416cfaec569b9614d92f97023 (diff) | |
| download | nixlib-1ac0e05f69674839d0a3478d8dd776caccca9b04.tar nixlib-1ac0e05f69674839d0a3478d8dd776caccca9b04.tar.gz nixlib-1ac0e05f69674839d0a3478d8dd776caccca9b04.tar.bz2 nixlib-1ac0e05f69674839d0a3478d8dd776caccca9b04.tar.lz nixlib-1ac0e05f69674839d0a3478d8dd776caccca9b04.tar.xz nixlib-1ac0e05f69674839d0a3478d8dd776caccca9b04.tar.zst nixlib-1ac0e05f69674839d0a3478d8dd776caccca9b04.zip | |
nixos/setuid-wrappers: Build with normal mkDerivation phases
This way the binary gets stripped & rpath-shrinked etc. as usual. We'd seem to get a runtime reference to gcc otherwise.
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/security/setuid-wrappers.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/security/setuid-wrappers.nix b/nixos/modules/security/setuid-wrappers.nix index 2a289dc402ce..7d69f9b1183d 100644 --- a/nixos/modules/security/setuid-wrappers.nix +++ b/nixos/modules/security/setuid-wrappers.nix @@ -8,12 +8,12 @@ let setuidWrapper = pkgs.stdenv.mkDerivation { name = "setuid-wrapper"; - buildCommand = '' + unpackPhase = "true"; + installPhase = '' mkdir -p $out/bin cp ${./setuid-wrapper.c} setuid-wrapper.c gcc -Wall -O2 -DWRAPPER_DIR=\"${wrapperDir}\" \ setuid-wrapper.c -o $out/bin/setuid-wrapper - strip -S $out/bin/setuid-wrapper ''; }; |