diff options
| author | Alyssa Ross <hi@alyssa.is> | 2024-02-20 12:16:56 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2024-02-20 12:16:56 +0100 |
| commit | b24d64b3b1ef897f07cd072a88a9881cb330aa7f (patch) | |
| tree | a87bb2eed9af3ef1efd51dd65221d91f0c949041 /nixpkgs/pkgs/development/libraries/gdal | |
| parent | 73338df7473bb3810e70a16b8b0cba4f0f606f2b (diff) | |
| parent | fa15b53dbea5028db38d6e09b4cef6eba42aeebb (diff) | |
| download | nixlib-b24d64b3b1ef897f07cd072a88a9881cb330aa7f.tar nixlib-b24d64b3b1ef897f07cd072a88a9881cb330aa7f.tar.gz nixlib-b24d64b3b1ef897f07cd072a88a9881cb330aa7f.tar.bz2 nixlib-b24d64b3b1ef897f07cd072a88a9881cb330aa7f.tar.lz nixlib-b24d64b3b1ef897f07cd072a88a9881cb330aa7f.tar.xz nixlib-b24d64b3b1ef897f07cd072a88a9881cb330aa7f.tar.zst nixlib-b24d64b3b1ef897f07cd072a88a9881cb330aa7f.zip | |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/gdal')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/gdal/default.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/development/libraries/gdal/default.nix b/nixpkgs/pkgs/development/libraries/gdal/default.nix index fd1aaf9c2e92..64801dd5b714 100644 --- a/nixpkgs/pkgs/development/libraries/gdal/default.nix +++ b/nixpkgs/pkgs/development/libraries/gdal/default.nix @@ -79,13 +79,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "gdal"; - version = "3.8.3"; + version = "3.8.4"; src = fetchFromGitHub { owner = "OSGeo"; repo = "gdal"; rev = "v${finalAttrs.version}"; - hash = "sha256-GYBGGZ2bobVYElO0WJrsQzLMdNR5AfQwgdjBtPeGH1g="; + hash = "sha256-R9VLof13OXPbWGHOG1Q4WZWSPoF739C6WuNWxoIwKTw="; }; nativeBuildInputs = [ @@ -198,8 +198,9 @@ stdenv.mkDerivation (finalAttrs: { ++ darwinDeps ++ nonDarwinDeps; + pythonPath = [ python3.pkgs.numpy ]; postInstall = '' - wrapPythonPrograms + wrapPythonProgramsIn "$out/bin" "$out $pythonPath" '' + lib.optionalString useJava '' cd $out/lib ln -s ./jni/libgdalalljni${stdenv.hostPlatform.extensions.sharedLibrary} |