mirrors/sops-nix
mirrors/sops-nix
1
0
Fork 0
mirror of https://github.com/Mic92/sops-nix.git synced 2025-03-31 04:14:37 +00:00
Code Activity

fix 32-bit build

Browse source
This commit is contained in:
Jörg Thalheim 2021-02-01 09:25:59 +01:00
parent b37a5b9a45
commit d665aecd88
No known key found for this signature in database
GPG key ID: B3F5D81B0C6967C4
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
default.nix
View file

@ -40,5 +40,17 @@ in rec {
fixupPhase = ":";
});
cross-build = sops-install-secrets.overrideAttrs (old: {
name = "cross-build";
nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.gox ];
buildPhase = ''
(cd pkgs/sops-install-secrets && gox -os linux)
'';
installPhase = ''
touch $out
'';
fixupPhase = ":";
});
# integration tests
} // pkgs.lib.optionalAttrs (pkgs.stdenv.isLinux) sops-install-secrets.tests

4
pkgs/sops-install-secrets/main.go
View file

@ -251,7 +251,7 @@ func decryptSecrets(secrets []secret) error {
return nil
}
const RAMFS_MAGIC = 0x858458f6
const RAMFS_MAGIC int32 = -2054924042
func mountSecretFs(mountpoint string, keysGid int) error {
if err := os.MkdirAll(mountpoint, 0750); err != nil {
@ -262,7 +262,7 @@ func mountSecretFs(mountpoint string, keysGid int) error {
if err := unix.Statfs(mountpoint, &buf); err != nil {
return fmt.Errorf("Cannot get statfs for directory '%s': %w", mountpoint, err)
}
if buf.Type != RAMFS_MAGIC {
if int32(buf.Type) != RAMFS_MAGIC {
if err := unix.Mount("none", mountpoint, "ramfs", unix.MS_NODEV|unix.MS_NOSUID, "mode=0750"); err != nil {
return fmt.Errorf("Cannot mount: %s", err)
}