summary refs log tree commit diff
path: root/pkgs/applications/networking/linssid
diff options
context:
space:
mode:
authorPavel Chuprikov <pschuprikov@gmail.com>2019-03-15 16:28:02 +0100
committerUli Baum <xeji@cat3.de>2019-03-15 16:38:09 +0100
commitcc93879ffca7cae64d526eee8256ae55f177487e (patch)
tree316c196f72d023211f014e1abeaca8ac3673b836 /pkgs/applications/networking/linssid
parentd50fe701af800b31c40d11769036d9230304c5ff (diff)
downloadnixpkgs-cc93879ffca7cae64d526eee8256ae55f177487e.tar
nixpkgs-cc93879ffca7cae64d526eee8256ae55f177487e.tar.gz
nixpkgs-cc93879ffca7cae64d526eee8256ae55f177487e.tar.bz2
nixpkgs-cc93879ffca7cae64d526eee8256ae55f177487e.tar.lz
nixpkgs-cc93879ffca7cae64d526eee8256ae55f177487e.tar.xz
nixpkgs-cc93879ffca7cae64d526eee8256ae55f177487e.tar.zst
nixpkgs-cc93879ffca7cae64d526eee8256ae55f177487e.zip
linssid: fix build (#57686)
* tell qmake about QWT, so it does not create a header target
  * set QT_PLUGIN_PATH
  * set PATH so that necessary tools are available

(cherry picked from commit 926ec7dce6f8ac45775e1169535829799d9a8c87)
Diffstat (limited to 'pkgs/applications/networking/linssid')
-rw-r--r--pkgs/applications/networking/linssid/default.nix14
1 files changed, 9 insertions, 5 deletions
diff --git a/pkgs/applications/networking/linssid/default.nix b/pkgs/applications/networking/linssid/default.nix
index 0139a3f3a93..be010c47179 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 }:
+{ stdenv, fetchurl, qtbase, qtsvg, qmake, pkgconfig, boost, wirelesstools, iw, qwt, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "linssid-${version}";
@@ -9,25 +9,29 @@ stdenv.mkDerivation rec {
     sha256 = "13d35rlcjncd8lx3khkgn9x8is2xjd5fp6ns5xsn3w6l4xj9b4gl";
   };
 
-  nativeBuildInputs = [ pkgconfig qmake ];
+  nativeBuildInputs = [ pkgconfig qmake makeWrapper ];
   buildInputs = [ qtbase qtsvg boost qwt ];
 
   patches = [ ./0001-unbundled-qwt.patch ];
 
   postPatch = ''
+    sed -e "s|/usr/include/qt5.*$|& ${qwt}/include|" -i linssid-app/linssid-app.pro
     sed -e "s|/usr/include/|/nonexistent/|g" -i linssid-app/*.pro
     sed -e 's|^LIBS .*= .*libboost_regex.a|LIBS += -lboost_regex|' \
         -e "s|/usr|$out|g" \
         -i linssid-app/linssid-app.pro linssid-app/linssid.desktop
     sed -e "s|\.\./\.\./\.\./\.\./usr|$out|g" -i linssid-app/*.ui
 
-    sed -e "s|iwlist|${wirelesstools}/sbin/iwlist|g" -i linssid-app/Getter.cpp
-    sed -e "s|iw dev|${iw}/sbin/iw dev|g" -i linssid-app/MainForm.cpp
-
     # Remove bundled qwt
     rm -fr qwt-lib
   '';
 
+  postInstall = ''
+    wrapProgram $out/bin/linssid \
+      --prefix QT_PLUGIN_PATH : ${qtbase}/${qtbase.qtPluginPrefix} \
+      --prefix PATH : ${stdenv.lib.makeBinPath [ wirelesstools iw ]}  
+      '';
+
   meta = with stdenv.lib; {
     description = "Graphical wireless scanning for Linux";
     homepage = https://sourceforge.net/projects/linssid/;