Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d50fe701af80
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: cc93879ffca7
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Mar 15, 2019

  1. 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 926ec7d)
    @pschuprikov @xeji
    pschuprikov authored and xeji committed Mar 15, 2019

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: 91BE884FBA4B591A
    Learn about vigilant mode
    Copy the full SHA
    cc93879 View commit details
Showing with 9 additions and 5 deletions.
  1. +9 −5 pkgs/applications/networking/linssid/default.nix
14 changes: 9 additions & 5 deletions pkgs/applications/networking/linssid/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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/;