diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
| commit | 99fcaeccb89621dd492203ce1f2d551c06f228ed (patch) | |
| tree | 41cb730ae07383004789779b0f6e11cb3f4642a3 /nixpkgs/pkgs/development/libraries/libvirt/0002-substitute-zfs-and-zpool-commands.patch | |
| parent | 59c5f5ac8682acc13bb22bc29c7cf02f7d75f01f (diff) | |
| parent | 75a5ebf473cd60148ba9aec0d219f72e5cf52519 (diff) | |
| download | nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.gz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.bz2 nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.lz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.xz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.zst nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.zip | |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/nixos/modules/config/console.nix nixpkgs/nixos/modules/services/mail/mailman.nix nixpkgs/nixos/modules/services/mail/public-inbox.nix nixpkgs/nixos/modules/services/mail/rss2email.nix nixpkgs/nixos/modules/services/networking/ssh/sshd.nix nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix nixpkgs/pkgs/applications/networking/irc/weechat/default.nix nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/interpreters/python/default.nix nixpkgs/pkgs/development/node-packages/overrides.nix nixpkgs/pkgs/development/tools/b4/default.nix nixpkgs/pkgs/servers/dict/dictd-db.nix nixpkgs/pkgs/servers/mail/public-inbox/default.nix nixpkgs/pkgs/tools/security/pinentry/default.nix nixpkgs/pkgs/tools/text/unoconv/default.nix nixpkgs/pkgs/top-level/all-packages.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libvirt/0002-substitute-zfs-and-zpool-commands.patch')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/libvirt/0002-substitute-zfs-and-zpool-commands.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libvirt/0002-substitute-zfs-and-zpool-commands.patch b/nixpkgs/pkgs/development/libraries/libvirt/0002-substitute-zfs-and-zpool-commands.patch new file mode 100644 index 000000000000..9f380533ee45 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libvirt/0002-substitute-zfs-and-zpool-commands.patch @@ -0,0 +1,27 @@ +From dc5e3df2fd29a547ef0f9545e190a0ce3a73c95c Mon Sep 17 00:00:00 2001 +From: Tako Marks <me@github.tako.mx> +Date: Tue, 6 Sep 2022 20:19:26 +0200 +Subject: [PATCH] substitute zfs and zpool commands + +--- + src/storage/storage_backend_zfs.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/storage/storage_backend_zfs.c b/src/storage/storage_backend_zfs.c +index 2a5d74357d..460b3025c4 100644 +--- a/src/storage/storage_backend_zfs.c ++++ b/src/storage/storage_backend_zfs.c +@@ -33,8 +33,8 @@ + + VIR_LOG_INIT("storage.storage_backend_zfs"); + +-#define ZFS "zfs" +-#define ZPOOL "zpool" ++#define ZFS "@zfs@" ++#define ZPOOL "@zpool@" + + /* + * Some common flags of zfs and zpool commands we use: +-- +2.36.2 + |