diff options
author | Alyssa Ross <hi@alyssa.is> | 2019-01-07 02:18:36 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2019-01-07 02:18:47 +0000 |
commit | 36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2 (patch) | |
tree | b3faaf573407b32aa645237a4d16b82778a39a92 /nixpkgs/pkgs/applications/networking/linssid/0001-unbundled-qwt.patch | |
parent | 4e31070265257dc67d120c27e0f75c2344fdfa9a (diff) | |
parent | abf060725d7614bd3b9f96764262dfbc2f9c2199 (diff) | |
download | nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.tar nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.tar.gz nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.tar.bz2 nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.tar.lz nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.tar.xz nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.tar.zst nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.zip |
Add 'nixpkgs/' from commit 'abf060725d7614bd3b9f96764262dfbc2f9c2199'
git-subtree-dir: nixpkgs git-subtree-mainline: 4e31070265257dc67d120c27e0f75c2344fdfa9a git-subtree-split: abf060725d7614bd3b9f96764262dfbc2f9c2199
Diffstat (limited to 'nixpkgs/pkgs/applications/networking/linssid/0001-unbundled-qwt.patch')
-rw-r--r-- | nixpkgs/pkgs/applications/networking/linssid/0001-unbundled-qwt.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/applications/networking/linssid/0001-unbundled-qwt.patch b/nixpkgs/pkgs/applications/networking/linssid/0001-unbundled-qwt.patch new file mode 100644 index 000000000000..46224ede33d4 --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/linssid/0001-unbundled-qwt.patch @@ -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 + |