Skip to content

Commit 894dcf7

Browse files
mdaniels5757mweinelt
mdaniels5757
authored and
mweinelt
committed
various: fix makeWrapperArgs
1 parent 03ca991 commit 894dcf7

18 files changed

Lines changed: 57 additions & 22 deletions

File tree

‎pkgs/by-name/bl/bleachbit/package.nix‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ python3Packages.buildPythonApplication (finalAttrs: {
5454

5555
# Prevent double wrapping from wrapGApps and wrapPythonProgram
5656
dontWrapGApps = true;
57-
makeWrapperArgs = [
58-
"\${gappsWrapperArgs[@]}"
59-
];
57+
preFixup = ''
58+
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
59+
'';
6060

6161
strictDeps = false;
6262

‎pkgs/by-name/ca/calligraphy/package.nix‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,9 @@ python3Packages.buildPythonApplication (finalAttrs: {
4545

4646
dontWrapGApps = true;
4747

48-
makeWrapperArgs = [ "\${gappsWrapperArgs[@]}" ];
48+
preFixup = ''
49+
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
50+
'';
4951

5052
passthru.updateScript = nix-update-script { };
5153

‎pkgs/by-name/cp/cpupower-gui/package.nix‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,9 @@ python3Packages.buildPythonApplication rec {
8686
strictDeps = false;
8787
dontWrapGApps = true;
8888

89-
makeWrapperArgs = [ "\${gappsWrapperArgs[@]}" ];
89+
preFixup = ''
90+
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
91+
'';
9092

9193
postFixup = ''
9294
wrapPythonProgramsIn $out/lib "$out $propagatedBuildInputs"

‎pkgs/by-name/hi/high-tide/package.nix‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,9 @@ python313Packages.buildPythonApplication (finalAttrs: {
6666

6767
dontWrapGApps = true;
6868

69-
makeWrapperArgs = [ "\${gappsWrapperArgs[@]}" ];
69+
preFixup = ''
70+
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
71+
'';
7072

7173
passthru.updateScript = nix-update-script { };
7274

‎pkgs/by-name/kr/krop/package.nix‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@ python3Packages.buildPythonApplication (finalAttrs: {
3232
ghostscript
3333
];
3434

35-
makeWrapperArgs = [ "\${qtWrapperArgs[@]}" ];
35+
preFixup = ''
36+
makeWrapperArgs+=("''${qtWrapperArgs[@]}")
37+
'';
3638

3739
# Disable checks because of interference with older Qt versions // xcb
3840
doCheck = false;

‎pkgs/by-name/me/meteo-qt/package.nix‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,9 @@ python3Packages.buildPythonApplication (finalAttrs: {
4444

4545
pythonImportsCheck = [ "meteo_qt" ];
4646

47-
makeWrapperArgs = [ "\${qtWrapperArgs[@]}" ];
47+
preFixup = ''
48+
makeWrapperArgs+=("''${qtWrapperArgs[@]}")
49+
'';
4850

4951
meta = {
5052
description = "System tray application for weather status information";

‎pkgs/by-name/pu/pulseaudio-dlna/package.nix‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,12 @@ python3Packages.buildPythonApplication {
6262
# pulseaudio-dlna shells out to pactl to configure sinks and sources.
6363
# As pactl might not be in $PATH, add --suffix it (so pactl configured by the
6464
# user get priority)
65-
makeWrapperArgs = [ "--suffix PATH : ${lib.makeBinPath [ pulseaudio ]}" ];
65+
makeWrapperArgs = [
66+
"--suffix"
67+
"PATH"
68+
":"
69+
(lib.makeBinPath [ pulseaudio ])
70+
];
6671

6772
# upstream has no tests
6873
checkPhase = ''

‎pkgs/by-name/pu/pulsemeeter/package.nix‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ python3Packages.buildPythonApplication (finalAttrs: {
4646
gtk4
4747
];
4848

49-
makeWrapperArgs = [
50-
"\${gappsWrapperArgs[@]}"
51-
];
49+
preFixup = ''
50+
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
51+
'';
5252

5353
dontWrapGApps = true;
5454

‎pkgs/by-name/re/refine/package.nix‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,9 @@ python3Packages.buildPythonApplication (finalAttrs: {
6262

6363
dontWrapGApps = true;
6464

65-
makeWrapperArgs = [ "\${gappsWrapperArgs[@]}" ];
65+
preFixup = ''
66+
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
67+
'';
6668

6769
# NOTE: `postCheck` is intentionally not used here, as the entire checkPhase
6870
# is skipped by `buildPythonApplication`

‎pkgs/by-name/re/rewaita/package.nix‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,9 @@ python3Packages.buildPythonApplication {
6363
];
6464

6565
dontWrapGApps = true;
66-
makeWrapperArgs = [ "\${gappsWrapperArgs[@]}" ];
66+
preFixup = ''
67+
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
68+
'';
6769

6870
passthru.updateScript = nix-update-script { };
6971

0 commit comments

Comments
 (0)