uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead
https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948 this can do it nicely. Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
commit
56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
|
|
@ -0,0 +1,43 @@
|
|||
From e57f22a5089f194013534c9a9bbc42ee639297f1 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Tuegel <ttuegel@gmail.com>
|
||||
Date: Sat, 19 Sep 2015 11:10:32 -0500
|
||||
Subject: [PATCH] unbundled qwt
|
||||
|
||||
---
|
||||
linssid-app/linssid-app.pro | 4 +---
|
||||
linssid.pro | 4 +---
|
||||
2 files changed, 2 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/linssid-app/linssid-app.pro b/linssid-app/linssid-app.pro
|
||||
index 26f61e7..7b80b60 100644
|
||||
--- a/linssid-app/linssid-app.pro
|
||||
+++ b/linssid-app/linssid-app.pro
|
||||
@@ -19,13 +19,11 @@ QMAKE_CC = gcc
|
||||
QMAKE_CXX = g++
|
||||
DEFINES +=
|
||||
INCLUDEPATH += /usr/include/qt5
|
||||
-# /usr/local/qwt-6.1.0/include
|
||||
-INCLUDEPATH += ../qwt-lib/src
|
||||
# LIBS += /usr/lib/x86_64-linux-gnu/libboost_regex.a
|
||||
# LIBS += -lboost_regex
|
||||
LIBS += -l:libboost_regex.a
|
||||
# /usr/local/qwt-6.1.0/lib/libqwt.a
|
||||
-LIBS += ../qwt-lib/lib/libqwt.a
|
||||
+LIBS += -lqwt
|
||||
QMAKE_CXXFLAGS += -std=c++11
|
||||
#
|
||||
TARGET = linssid
|
||||
diff --git a/linssid.pro b/linssid.pro
|
||||
index 42dc277..26d1a2c 100644
|
||||
--- a/linssid.pro
|
||||
+++ b/linssid.pro
|
||||
@@ -1,5 +1,3 @@
|
||||
TEMPLATE = subdirs
|
||||
CONFIG += ordered
|
||||
-SUBDIRS = qwt-lib \
|
||||
- linssid-app
|
||||
-linssid-app.depends = qwt-lib
|
||||
+SUBDIRS = linssid-app
|
||||
--
|
||||
2.5.2
|
||||
|
||||
39
pkgs/applications/networking/linssid/default.nix
Normal file
39
pkgs/applications/networking/linssid/default.nix
Normal file
|
|
@ -0,0 +1,39 @@
|
|||
{ lib, stdenv, fetchurl, qtbase, qtsvg, qmake, pkg-config, boost, wirelesstools, iw, qwt6_1, wrapQtAppsHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "linssid";
|
||||
version = "2.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/project/linssid/LinSSID_${version}/linssid_${version}.orig.tar.gz";
|
||||
sha256 = "13d35rlcjncd8lx3khkgn9x8is2xjd5fp6ns5xsn3w6l4xj9b4gl";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config qmake wrapQtAppsHook ];
|
||||
buildInputs = [ qtbase qtsvg boost qwt6_1 ];
|
||||
|
||||
patches = [ ./0001-unbundled-qwt.patch ];
|
||||
|
||||
postPatch = ''
|
||||
sed -e "s|/usr/include/qt5.*$|& ${qwt6_1}/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
|
||||
|
||||
# Remove bundled qwt
|
||||
rm -fr qwt-lib
|
||||
'';
|
||||
|
||||
qtWrapperArgs =
|
||||
[ ''--prefix PATH : ${lib.makeBinPath [ wirelesstools iw ]}'' ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Graphical wireless scanning for Linux";
|
||||
homepage = "https://sourceforge.net/projects/linssid/";
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.bjornfor ];
|
||||
};
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue