diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2021-09-28 10:29:46 -0400 |
|---|---|---|
| committer | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2021-09-28 10:29:46 -0400 |
| commit | e0532475bca400362a2a488e31c86c6628a8e55a (patch) | |
| tree | 4a0d5c78ead76e0cbb1e16e3c40511db8e80b4e3 /pkgs/tools | |
| parent | ee33a90c568ce8100f86860116ba02492857e07e (diff) | |
| download | nixpkgs-e0532475bca400362a2a488e31c86c6628a8e55a.tar nixpkgs-e0532475bca400362a2a488e31c86c6628a8e55a.tar.gz nixpkgs-e0532475bca400362a2a488e31c86c6628a8e55a.tar.bz2 nixpkgs-e0532475bca400362a2a488e31c86c6628a8e55a.tar.lz nixpkgs-e0532475bca400362a2a488e31c86c6628a8e55a.tar.xz nixpkgs-e0532475bca400362a2a488e31c86c6628a8e55a.tar.zst nixpkgs-e0532475bca400362a2a488e31c86c6628a8e55a.zip | |
treewide: remove darwin-only manual wrapQtApp invocations
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/audio/opl3bankeditor/common.nix | 1 | ||||
| -rw-r--r-- | pkgs/tools/filesystems/android-file-transfer/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/tools/graphics/gnuplot/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/text/glogg/default.nix | 1 |
4 files changed, 0 insertions, 7 deletions
diff --git a/pkgs/tools/audio/opl3bankeditor/common.nix b/pkgs/tools/audio/opl3bankeditor/common.nix index 9f6972ce954..04f4d3aae5a 100644 --- a/pkgs/tools/audio/opl3bankeditor/common.nix +++ b/pkgs/tools/audio/opl3bankeditor/common.nix @@ -53,7 +53,6 @@ mkDerivation rec { mv "${binname}.app" $out/Applications/ install_name_tool -change {,${qwt}/lib/}libqwt.6.dylib "$out/Applications/${binname}.app/Contents/MacOS/${binname}" - wrapQtApp "$out/Applications/${binname}.app/Contents/MacOS/${binname}" ln -s "$out/Applications/${binname}.app/Contents/MacOS/${binname}" $out/bin/${mainProgram} ''; diff --git a/pkgs/tools/filesystems/android-file-transfer/default.nix b/pkgs/tools/filesystems/android-file-transfer/default.nix index a8511f8b99a..b355b0eb686 100644 --- a/pkgs/tools/filesystems/android-file-transfer/default.nix +++ b/pkgs/tools/filesystems/android-file-transfer/default.nix @@ -29,9 +29,6 @@ mkDerivation rec { postInstall = lib.optionalString stdenv.isDarwin '' mkdir $out/Applications mv $out/*.app $out/Applications - for f in $out/Applications/android-file-transfer.app/Contents/MacOS/*; do - wrapQtApp "$f" - done ''; meta = with lib; { diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index 741468dfd99..c6c90442ddc 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -58,8 +58,6 @@ in --prefix PATH : '${coreutils}/bin' \ --prefix PATH : '${fontconfig.bin}/bin' \ --run '. ${./set-gdfontpath-from-fontconfig.sh}' - '' + lib.optionalString (stdenv.isDarwin && withQt) '' - wrapQtApp $out/bin/gnuplot ''; enableParallelBuilding = true; diff --git a/pkgs/tools/text/glogg/default.nix b/pkgs/tools/text/glogg/default.nix index 306c25498ad..855490df4ab 100644 --- a/pkgs/tools/text/glogg/default.nix +++ b/pkgs/tools/text/glogg/default.nix @@ -25,7 +25,6 @@ mkDerivation rec { mkdir -p $out/Applications mv $out/bin/glogg.app $out/Applications/glogg.app rm -fr $out/{bin,share} - wrapQtApp $out/Applications/glogg.app/Contents/MacOS/glogg ''; meta = with lib; { |