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

qt5: remove makeQtWrapper

Browse Source
This commit is contained in:
Thomas Tuegel
2017-06-18 08:44:42 -05:00
parent 1607f51613
commit c816bbc8a8
92 changed files with 323 additions and 582 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/networking/instant-messengers/tensor/default.nix
+2 -4
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchgit, qtbase, qtquickcontrols, qmake, makeQtWrapper, makeDesktopItem }:
{ stdenv, fetchgit, qtbase, qtquickcontrols, qmake, makeDesktopItem }:
stdenv.mkDerivation rec {
name = "tensor-git-${version}";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
buildInputs = [ qtbase qtquickcontrols ];
nativeBuildInputs = [ qmake makeQtWrapper ];
nativeBuildInputs = [ qmake ];
desktopItem = makeDesktopItem {
name = "tensor";
@@ -36,8 +36,6 @@ stdenv.mkDerivation rec {
install -Dm644 ${desktopItem}/share/applications/tensor.desktop \
$out/share/applications/tensor.desktop
wrapQtProgram $out/bin/tensor
substituteInPlace $out/share/applications/tensor.desktop \
--subst-var-by bin $out/bin/tensor