diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-04-12 11:26:22 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-04-12 11:26:22 +0200 |
| commit | dddb62d3e31bed1d6127f396f5f89c6ed2799c9e (patch) | |
| tree | 5165fa3fbb9494b5219284f8a3b7f59336f5c6b5 /pkgs | |
| parent | 4709bdcb7180525335eebdd0150e461ed3174d91 (diff) | |
| parent | e366d8294ee3afedfd951222ec8a8fc8c60c1063 (diff) | |
| download | nixlib-dddb62d3e31bed1d6127f396f5f89c6ed2799c9e.tar nixlib-dddb62d3e31bed1d6127f396f5f89c6ed2799c9e.tar.gz nixlib-dddb62d3e31bed1d6127f396f5f89c6ed2799c9e.tar.bz2 nixlib-dddb62d3e31bed1d6127f396f5f89c6ed2799c9e.tar.lz nixlib-dddb62d3e31bed1d6127f396f5f89c6ed2799c9e.tar.xz nixlib-dddb62d3e31bed1d6127f396f5f89c6ed2799c9e.tar.zst nixlib-dddb62d3e31bed1d6127f396f5f89c6ed2799c9e.zip | |
Merge pull request #14178 from the-kenny/systemd-cryptsetup-external-generator
Systemd: Allow specifying external generators
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/os-specific/linux/systemd/cryptsetup-generator.nix | 25 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
2 files changed, 28 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix b/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix new file mode 100644 index 000000000000..2935990755c6 --- /dev/null +++ b/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix @@ -0,0 +1,25 @@ +{ stdenv, systemd, cryptsetup }: + +assert stdenv.isLinux; + +stdenv.lib.overrideDerivation systemd (p: { + version = p.version; + name = "systemd-cryptsetup-generator"; + + nativeBuildInputs = p.nativeBuildInputs ++ [ cryptsetup ]; + outputs = [ "out" ]; + + buildPhase = '' + make $makeFlags built-sources + make $makeFlags systemd-cryptsetup + make $makeFlags systemd-cryptsetup-generator + ''; + + installPhase = '' + mkdir -p $out/lib/systemd/ + cp systemd-cryptsetup $out/lib/systemd/systemd-cryptsetup + + mkdir -p $out/lib/systemd/system-generators/ + cp systemd-cryptsetup-generator $out/lib/systemd/system-generators/systemd-cryptsetup-generator + ''; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8ca9370cc0e4..188788955ffe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11006,6 +11006,9 @@ in linuxHeaders = linuxHeaders_3_18; }; + # standalone cryptsetup generator for systemd + systemd-cryptsetup-generator = callPackage ../os-specific/linux/systemd/cryptsetup-generator.nix { }; + # In nixos, you can set systemd.package = pkgs.systemd_with_lvm2 to get # LVM2 working in systemd. systemd_with_lvm2 = pkgs.lib.overrideDerivation pkgs.systemd (p: { |