public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gdal: don't use composableDerivation

Browse Source
This commit is contained in:
Robin Gloster 2017-08-27 20:14:17 +02:00
parent f0a1ab78b4
commit 4d858a2a17
No known key found for this signature in database
GPG Key ID: D5C458DF6DD97EDF
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/gdal/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, composableDerivation, unzip, libjpeg, libtiff, zlib { stdenv, fetchurl, unzip, libjpeg, libtiff, zlib
, postgresql, mysql, libgeotiff, pythonPackages, proj, geos, openssl , postgresql, mysql, libgeotiff, pythonPackages, proj, geos, openssl
, libpng, sqlite, libspatialite, poppler, hdf4 , libpng, sqlite, libspatialite, poppler, hdf4
, libiconv , libiconv

6
pkgs/development/libraries/gdal/gdal-1_11.nix
View File

@ -1,8 +1,8 @@
{ stdenv, fetchurl, composableDerivation, unzip, libjpeg, libtiff, zlib { stdenv, fetchurl, unzip, libjpeg, libtiff, zlib
, postgresql, mysql, libgeotiff, python, pythonPackages, proj, geos, openssl , postgresql, mysql, libgeotiff, python, pythonPackages, proj, geos, openssl
, libpng }: , libpng }:
composableDerivation.composableDerivation {} (fixed: rec { stdenv.mkDerivation rec {
version = "1.11.3"; version = "1.11.3";
name = "gdal-${version}"; name = "gdal-${version}";
@ -58,4 +58,4 @@ composableDerivation.composableDerivation {} (fixed: rec {
maintainers = [ stdenv.lib.maintainers.marcweber ]; maintainers = [ stdenv.lib.maintainers.marcweber ];
platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.linux;
}; };
}) }