public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #123552 from stephank/fix-tensor-darwin

Browse Source 
tensor: fix darwin build
This commit is contained in:
Robert Scott 2021-05-19 00:05:46 +01:00 committed by GitHub
commit a43542f2b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/applications/networking/instant-messengers/tensor/default.nix
View File

@ -1,4 +1,5 @@
{ mkDerivation, lib, fetchgit, qtbase, qtquickcontrols, qmake, makeDesktopItem }: { mkDerivation, lib, stdenv, fetchgit, qtbase, qtquickcontrols, qmake
, makeDesktopItem }:
# we now have libqmatrixclient so a future version of tensor that supports it # we now have libqmatrixclient so a future version of tensor that supports it
# should use that # should use that
@ -30,7 +31,15 @@ mkDerivation rec {
mimeType = "application/x-chat"; mimeType = "application/x-chat";
}; };
installPhase = '' installPhase = if stdenv.isDarwin then ''
runHook preInstall
mkdir -p $out/Applications
cp -r tensor.app $out/Applications/tensor.app
wrapQtApp $out/Applications/tensor.app/Contents/MacOS/tensor
runHook postInstall
'' else ''
runHook preInstall runHook preInstall
install -Dm755 tensor $out/bin/tensor install -Dm755 tensor $out/bin/tensor