proj: enable strictDeps and __structuredAttrs, cleanup
This commit is contained in:
@@ -13,11 +13,14 @@
|
||||
nlohmann_json,
|
||||
python3,
|
||||
cacert,
|
||||
writableTmpDirAsHomeHook,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "proj";
|
||||
version = "9.8.1";
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OSGeo";
|
||||
@@ -50,6 +53,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
nativeCheckInputs = [
|
||||
cacert
|
||||
sqlite
|
||||
writableTmpDirAsHomeHook
|
||||
];
|
||||
checkInputs = [
|
||||
gtest
|
||||
];
|
||||
|
||||
@@ -57,13 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"-DUSE_EXTERNAL_GTEST=ON"
|
||||
"-DRUN_NETWORK_DEPENDENT_TESTS=OFF"
|
||||
"-DNLOHMANN_JSON_ORIGIN=external"
|
||||
"-DEXE_SQLITE3=${buildPackages.sqlite}/bin/sqlite3"
|
||||
];
|
||||
|
||||
env.CXXFLAGS = toString [
|
||||
# GCC 13: error: 'int64_t' in namespace 'std' does not name a type
|
||||
"-include"
|
||||
"cstdint"
|
||||
"-DEXE_SQLITE3=${lib.getExe buildPackages.sqlite}"
|
||||
];
|
||||
|
||||
preCheck =
|
||||
@@ -71,7 +72,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libPathEnvVar = if stdenv.hostPlatform.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH";
|
||||
in
|
||||
''
|
||||
export HOME=$TMPDIR
|
||||
export TMP=$TMPDIR
|
||||
export ${libPathEnvVar}=$PWD/lib
|
||||
'';
|
||||
|
||||
Reference in New Issue
Block a user