wrapQtAppsHook: Remove ad hoc Qt wrappers
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, qtbase, qtsvg, qmake, pkgconfig, boost, wirelesstools, iw, qwt, makeWrapper }:
|
||||
{ stdenv, fetchurl, qtbase, qtsvg, qmake, pkgconfig, boost, wirelesstools, iw, qwt, wrapQtAppsHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "linssid-${version}";
|
||||
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "13d35rlcjncd8lx3khkgn9x8is2xjd5fp6ns5xsn3w6l4xj9b4gl";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig qmake makeWrapper ];
|
||||
nativeBuildInputs = [ pkgconfig qmake wrapQtAppsHook ];
|
||||
buildInputs = [ qtbase qtsvg boost qwt ];
|
||||
|
||||
patches = [ ./0001-unbundled-qwt.patch ];
|
||||
@@ -26,11 +26,8 @@ stdenv.mkDerivation rec {
|
||||
rm -fr qwt-lib
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/linssid \
|
||||
--prefix QT_PLUGIN_PATH : ${qtbase}/${qtbase.qtPluginPrefix} \
|
||||
--prefix PATH : ${stdenv.lib.makeBinPath [ wirelesstools iw ]}
|
||||
'';
|
||||
qtWrapperArgs =
|
||||
[ ''--prefix PATH : ${stdenv.lib.makeBinPath [ wirelesstools iw ]}'' ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Graphical wireless scanning for Linux";
|
||||
|
||||
Reference in New Issue
Block a user