Skip to content

Commit c91461a

Browse files
uwsm: stop propagating wrapped tools (#385933)
2 parents c3bb745 + a2ca3c1 commit c91461a

File tree

1 file changed

+12
-14
lines changed

1 file changed

+12
-14
lines changed

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

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,14 @@ stdenv.mkDerivation (finalAttrs: {
4545
scdoc
4646
];
4747

48-
propagatedBuildInputs = [
48+
buildInputs = [
4949
util-linux # waitpid
5050
newt # whiptail
5151
libnotify # notify
5252
bash # sh
5353
systemd
5454
python
55-
] ++ (lib.optionals uuctlSupport [ dmenu ]);
55+
] ++ lib.optionals uuctlSupport [ dmenu ];
5656

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

6868
postInstall =
6969
let
70-
wrapperArgs = ''
71-
--suffix PATH : "${lib.makeBinPath finalAttrs.propagatedBuildInputs}"
72-
'';
70+
wrapperArgs = "--suffix PATH : ${lib.makeBinPath finalAttrs.buildInputs}";
7371
in
7472
''
7573
wrapProgram $out/bin/uwsm ${wrapperArgs}
76-
${lib.optionalString uuctlSupport ''
77-
wrapProgram $out/bin/uuctl ${wrapperArgs}
78-
''}
79-
${lib.optionalString uwsmAppSupport ''
80-
wrapProgram $out/bin/uwsm-app ${wrapperArgs}
81-
''}
82-
${lib.optionalString fumonSupport ''
83-
wrapProgram $out/bin/fumon ${wrapperArgs}
84-
''}
74+
''
75+
+ lib.optionalString uuctlSupport ''
76+
wrapProgram $out/bin/uuctl ${wrapperArgs}
77+
''
78+
+ lib.optionalString uwsmAppSupport ''
79+
wrapProgram $out/bin/uwsm-app ${wrapperArgs}
80+
''
81+
+ lib.optionalString fumonSupport ''
82+
wrapProgram $out/bin/fumon ${wrapperArgs}
8583
'';
8684

8785
outputs = [

0 commit comments

Comments
 (0)