interlock: init at 2016.01.14

Also add textsecure on which it depends:
textsecure: init at 505e129c42fc4c5cb2d105520cef7c04fa3a6b64
This commit is contained in:
Nicolas Pouillard 2016-01-21 22:43:46 +01:00
parent b39c51a362
commit a04e3c7615
No known key found for this signature in database
GPG Key ID: 10C40A56EADFABBA
2 changed files with 36 additions and 0 deletions

View File

@ -879,6 +879,8 @@ let
heatseeker = callPackage ../tools/misc/heatseeker { };
interlock = goPackages.interlock.bin // { outputs = [ "bin" ]; };
mathics = pythonPackages.mathics;
mcrl = callPackage ../tools/misc/mcrl { };

View File

@ -3599,4 +3599,38 @@ let
xargs -d '\n' sed -i -e s,github.com/ericchiang/pup/Godeps/_workspace/src/,,g
'';
};
textsecure = buildFromGitHub rec {
rev = "505e129c42fc4c5cb2d105520cef7c04fa3a6b64";
owner = "janimo";
repo = "textsecure";
sha256 = "0sdcqd89dlic0bllb6mjliz4x54rxnm1r3xqd5qdp936n7xs3mc6";
propagatedBuildInputs = [ crypto protobuf ed25519 yaml-v2 logrus ];
disabled = isGo14;
};
interlock = buildFromGitHub rec {
version = "2016.01.14";
rev = "v${version}";
owner = "inversepath";
repo = "interlock";
sha256 = "0wabx6vqdxh2aprsm2rd9mh71q7c2xm6xk9a6r1bn53r9dh5wrsb";
buildInputs = [ crypto textsecure ];
nativeBuildInputs = [ pkgs.sudo ];
buildFlags = [ "-tags textsecure" ];
subPackages = [ "./cmd/interlock" ];
postPatch = ''
grep -lr '/s\?bin/' | xargs sed -i \
-e 's|/bin/mount|${pkgs.utillinux}/bin/mount|' \
-e 's|/bin/umount|${pkgs.utillinux}/bin/umount|' \
-e 's|/bin/cp|${pkgs.coreutils}/bin/cp|' \
-e 's|/bin/mv|${pkgs.coreutils}/bin/mv|' \
-e 's|/bin/chown|${pkgs.coreutils}/bin/chown|' \
-e 's|/bin/date|${pkgs.coreutils}/bin/date|' \
-e 's|/sbin/poweroff|${pkgs.systemd}/sbin/poweroff|' \
-e 's|/usr/bin/sudo|/var/setuid-wrappers/sudo|' \
-e 's|/sbin/cryptsetup|${pkgs.cryptsetup}/bin/cryptsetup|'
'';
disabled = isGo14;
};
}; in self