Unverified Commit 7f13a573 authored by Adam C. Stephens's avatar Adam C. Stephens Committed by GitHub
Browse files

[Backport release-25.11] {ovn,evolution}: Fix command not found (#465975)

parents 0e58d907 4c037c30

pkgs/applications/networking/mailreaders/evolution/evolution/default.nix

+15 −0
Original line number Diff line number Diff line
@@ -42,6 +42,9 @@ 
  p11-kit,

  openldap,

  spamassassin,

  gnutar,

  gzip,

  xz,

}:



stdenv.mkDerivation rec {
@@ -116,6 +119,18 @@ stdenv.mkDerivation rec { 
    "-DWITH_OPENLDAP=${openldap}"

  ];



  preFixup = ''

    gappsWrapperArgs+=(

      --prefix PATH : "${

        lib.makeBinPath [

          gnutar

          gzip

          xz

        ]

      }"

    )

  '';



  requiredSystemFeatures = [

    "big-parallel"

  ];

pkgs/by-name/ov/ovn/package.nix

+13 −1
Original line number Diff line number Diff line
@@ -15,6 +15,10 @@ 
  unbound,

  xdp-tools,

  openvswitch,

  gawk,

  coreutils,

  gnugrep,

  gnused,

  makeWrapper,

}:

let
@@ -117,7 +121,15 @@ stdenv.mkDerivation (finalAttrs: { 
    ln -s ${openvswitch}/share/openvswitch/scripts/ovs-lib $out/share/openvswitch/scripts/ovs-lib



    wrapProgram $out/share/ovn/scripts/ovn-ctl \

      --prefix PATH : ${lib.makeBinPath [ openvswitch ]}

      --prefix PATH : ${

        lib.makeBinPath [

          openvswitch

          gawk

          coreutils # tr

          gnugrep

          gnused

        ]

      }

  '';



  env = {