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/servers/gpsd/0001-Use-pkgconfig-for-dbus-library.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/servers/gpsd/0001-Use-pkgconfig-for-dbus-library.patch')
-rw-r--r-- | nixpkgs/pkgs/servers/gpsd/0001-Use-pkgconfig-for-dbus-library.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/servers/gpsd/0001-Use-pkgconfig-for-dbus-library.patch b/nixpkgs/pkgs/servers/gpsd/0001-Use-pkgconfig-for-dbus-library.patch new file mode 100644 index 000000000000..58ae754ecfb5 --- /dev/null +++ b/nixpkgs/pkgs/servers/gpsd/0001-Use-pkgconfig-for-dbus-library.patch @@ -0,0 +1,31 @@ +From b4ed6e9e89e3b7d57e5de9f2c1987a489bb5628c Mon Sep 17 00:00:00 2001 +From: Alexey Shmalko <rasen.dubi@gmail.com> +Date: Sat, 9 Jul 2016 20:54:05 +0300 +Subject: [PATCH] Use pkgconfig for dbus library + +Without this, gcc can't find library path for the dbus. + +This is already fixed upstream, so the patch shouldn't be necessary with +the next version of gpsd. +--- + SConstruct | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/SConstruct b/SConstruct +index 0d4b29d..d8624b0 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -586,8 +586,8 @@ else: + + if env['dbus_export'] and config.CheckPKG('dbus-1'): + confdefs.append("#define HAVE_DBUS 1\n") +- dbusflags = ["-ldbus-1"] +- env.MergeFlags(pkg_config("dbus-1")) ++ dbusflags = pkg_config("dbus-1") ++ env.MergeFlags(dbusflags) + else: + confdefs.append("/* #undef HAVE_DBUS */\n") + dbusflags = [] +-- +2.9.0 + |