Unverified Commit c91461ae authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

uwsm: stop propagating wrapped tools (#385933)

parents c3bb7450 a2ca3c1e

pkgs/by-name/uw/uwsm/package.nix

+12 −14
Original line number Diff line number Diff line
@@ -45,14 +45,14 @@ stdenv.mkDerivation (finalAttrs: { 
    scdoc

  ];



  propagatedBuildInputs = [

  buildInputs = [

    util-linux # waitpid

    newt # whiptail

    libnotify # notify

    bash # sh

    systemd

    python

  ] ++ (lib.optionals uuctlSupport [ dmenu ]);

  ] ++ lib.optionals uuctlSupport [ dmenu ];



  mesonFlags = [

    "--prefix=${placeholder "out"}"
@@ -67,21 +67,19 @@ stdenv.mkDerivation (finalAttrs: { 


  postInstall =

    let

      wrapperArgs = ''

        --suffix PATH : "${lib.makeBinPath finalAttrs.propagatedBuildInputs}"

      '';

      wrapperArgs = "--suffix PATH : ${lib.makeBinPath finalAttrs.buildInputs}";

    in

    ''

      wrapProgram $out/bin/uwsm ${wrapperArgs}

      ${lib.optionalString uuctlSupport ''

    ''

    + lib.optionalString uuctlSupport ''

      wrapProgram $out/bin/uuctl ${wrapperArgs}

      ''}

      ${lib.optionalString uwsmAppSupport ''

    ''

    + lib.optionalString uwsmAppSupport ''

      wrapProgram $out/bin/uwsm-app ${wrapperArgs}

      ''}

      ${lib.optionalString fumonSupport ''

    ''

    + lib.optionalString fumonSupport ''

      wrapProgram $out/bin/fumon ${wrapperArgs}

      ''}

    '';



  outputs = [