summary refs log tree commit diff
path: root/pkgs/applications/networking/linssid
diff options
context:
space:
mode:
authorThomas Tuegel <ttuegel@mailbox.org>2019-07-05 10:42:08 -0500
committerThomas Tuegel <ttuegel@mailbox.org>2019-07-05 10:42:08 -0500
commit51d78034a1db78f8ce0ea3ba6fa20be590ed0ca2 (patch)
tree0b9751f2bfd16a70e406b420c34a8d4097ad9492 /pkgs/applications/networking/linssid
parentf79fd2e826dd95b3b64839d3e0bec8ae1dfab17e (diff)
downloadnixpkgs-51d78034a1db78f8ce0ea3ba6fa20be590ed0ca2.tar
nixpkgs-51d78034a1db78f8ce0ea3ba6fa20be590ed0ca2.tar.gz
nixpkgs-51d78034a1db78f8ce0ea3ba6fa20be590ed0ca2.tar.bz2
nixpkgs-51d78034a1db78f8ce0ea3ba6fa20be590ed0ca2.tar.lz
nixpkgs-51d78034a1db78f8ce0ea3ba6fa20be590ed0ca2.tar.xz
nixpkgs-51d78034a1db78f8ce0ea3ba6fa20be590ed0ca2.tar.zst
nixpkgs-51d78034a1db78f8ce0ea3ba6fa20be590ed0ca2.zip
wrapQtAppsHook: Remove ad hoc Qt wrappers
Diffstat (limited to 'pkgs/applications/networking/linssid')
-rw-r--r--pkgs/applications/networking/linssid/default.nix11
1 files changed, 4 insertions, 7 deletions
diff --git a/pkgs/applications/networking/linssid/default.nix b/pkgs/applications/networking/linssid/default.nix
index be010c47179..14ee8095247 100644
--- a/pkgs/applications/networking/linssid/default.nix
+++ b/pkgs/applications/networking/linssid/default.nix
@@ -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";