mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 15:11:35 +00:00
c54b9b7b60
Build system is changed, gpsd uses scons now. The expressions needs some more work, TODO comments added. (xgps didn't work before this change either.) I added an option for the gpsd group, which is set to upstream default: "dialout". Note that our default gpsd user is "gpsd", while upstream uses "nobody" by default.
26 lines
832 B
Diff
26 lines
832 B
Diff
From d7e56abcae8bcb85dc935e94418a2f0e9956941b Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
|
|
Date: Mon, 17 Feb 2014 20:52:50 +0000
|
|
Subject: [PATCH 1/2] Import LD_LIBRARY_PATH to allow running 'scons check'
|
|
without 'chrpath'
|
|
|
|
---
|
|
SConstruct | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
diff --git a/SConstruct b/SConstruct
|
|
index 14e2f59..86b94bc 100644
|
|
--- a/SConstruct
|
|
+++ b/SConstruct
|
|
@@ -215,6 +215,7 @@ import_env = (
|
|
'PKG_CONFIG_LIBDIR', # Pass more environment variables to pkg-config (required for crossbuilds)
|
|
'STAGING_DIR', # Required by the OpenWRT and CeroWrt builds.
|
|
'STAGING_PREFIX', # Required by the OpenWRT and CeroWrt builds.
|
|
+ 'LD_LIBRARY_PATH', # Allows running 'scons check' without 'chrpath'
|
|
)
|
|
envs = {}
|
|
for var in import_env:
|
|
--
|
|
1.9.0
|
|
|