diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2019-12-10 18:23:57 -0500 |
|---|---|---|
| committer | worldofpeace <worldofpeace@protonmail.ch> | 2019-12-15 00:10:41 -0500 |
| commit | abe3475df8fd133045cd01fb14e0d7013cecf66e (patch) | |
| tree | aebe4b3150948da1ecb8bcd9f23d43715ab9e2c0 /pkgs/applications/misc/multibootusb/default.nix | |
| parent | 7ab19b15179d3b2fd7b63eab250a634048f3d88a (diff) | |
| download | nixpkgs-abe3475df8fd133045cd01fb14e0d7013cecf66e.tar nixpkgs-abe3475df8fd133045cd01fb14e0d7013cecf66e.tar.gz nixpkgs-abe3475df8fd133045cd01fb14e0d7013cecf66e.tar.bz2 nixpkgs-abe3475df8fd133045cd01fb14e0d7013cecf66e.tar.lz nixpkgs-abe3475df8fd133045cd01fb14e0d7013cecf66e.tar.xz nixpkgs-abe3475df8fd133045cd01fb14e0d7013cecf66e.tar.zst nixpkgs-abe3475df8fd133045cd01fb14e0d7013cecf66e.zip | |
treewide: remove bash snippets in flags
Co-Authored-By: Jan Tojnar <jtojnar@gmail.com>
Diffstat (limited to 'pkgs/applications/misc/multibootusb/default.nix')
| -rw-r--r-- | pkgs/applications/misc/multibootusb/default.nix | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/pkgs/applications/misc/multibootusb/default.nix b/pkgs/applications/misc/multibootusb/default.nix index 14201483294..ab8802a1b69 100644 --- a/pkgs/applications/misc/multibootusb/default.nix +++ b/pkgs/applications/misc/multibootusb/default.nix @@ -52,17 +52,6 @@ python36Packages.buildPythonApplication rec { python36Packages.six ]; - makeWrapperArgs = [ - # Firstly, add all necessary QT variables - "\${qtWrapperArgs[@]}" - - # Then, add the installed scripts/ directory to the python path - "--prefix" "PYTHONPATH" ":" "$out/lib/${python36Packages.python.libPrefix}/site-packages" - - # Finally, move to directory that contains data - "--run" "\"cd $out/share/${pname}\"" - ]; - postInstall = '' # This script doesn't work and it doesn't add much anyway rm $out/bin/multibootusb-pkexec @@ -72,6 +61,19 @@ python36Packages.buildPythonApplication rec { cp -r data "$out/share/${pname}/data" ''; + preFixup = '' + makeWrapperArgs+=( + # Firstly, add all necessary QT variables + "''${qtWrapperArgs[@]}" + + # Then, add the installed scripts/ directory to the python path + --prefix "PYTHONPATH" ":" "$out/lib/${python36Packages.python.libPrefix}/site-packages" + + # Finally, move to directory that contains data + --run "cd $out/share/${pname}" + ) + ''; + meta = with stdenv.lib; { description = "Multiboot USB creator for Linux live disks"; homepage = http://multibootusb.org/; |