Merge pull request #27639 from jfrankenau/update-firejail

firejail: 0.9.44.10 -> 0.9.48
This commit is contained in:
Joachim F 2017-07-28 05:45:57 +01:00 committed by GitHub
commit c36a68e7d3

View File

@ -3,11 +3,11 @@ let
s = # Generated upstream information s = # Generated upstream information
rec { rec {
baseName="firejail"; baseName="firejail";
version="0.9.44.10"; version="0.9.48";
name="${baseName}-${version}"; name="${baseName}-${version}";
hash="19wln3h54wcscqgcmkm8sprdh7vrn5k91rr0hagv055y1i52c7mj"; hash="02a74nx8p2gbpd6ffnr52p02pxxllw3yy5fy4083a77r3wia8zb3";
url="https://netix.dl.sourceforge.net/project/firejail/firejail/firejail-0.9.44.10.tar.xz"; url="https://vorboss.dl.sourceforge.net/project/firejail/firejail/firejail-0.9.48.tar.xz";
sha256="19wln3h54wcscqgcmkm8sprdh7vrn5k91rr0hagv055y1i52c7mj"; sha256="02a74nx8p2gbpd6ffnr52p02pxxllw3yy5fy4083a77r3wia8zb3";
}; };
buildInputs = [ buildInputs = [
which which
@ -21,6 +21,13 @@ stdenv.mkDerivation {
name = "${s.name}.tar.bz2"; name = "${s.name}.tar.bz2";
}; };
prePatch = ''
# Allow whitelisting ~/.nix-profile
substituteInPlace etc/firejail.config --replace \
'# follow-symlink-as-user yes' \
'follow-symlink-as-user no'
'';
preConfigure = '' preConfigure = ''
sed -e 's@/bin/bash@${stdenv.shell}@g' -i $( grep -lr /bin/bash .) sed -e 's@/bin/bash@${stdenv.shell}@g' -i $( grep -lr /bin/bash .)
sed -e "s@/bin/cp@$(which cp)@g" -i $( grep -lr /bin/cp .) sed -e "s@/bin/cp@$(which cp)@g" -i $( grep -lr /bin/cp .)