diff options
| author | Robin Gloster <mail@glob.in> | 2017-08-27 20:14:17 +0200 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2017-08-27 20:14:36 +0200 |
| commit | 4d858a2a17d1c65b4cabd43e5b63de3e58c0b12c (patch) | |
| tree | 19a24756a9463c54e12cfd8b0a030e683571540b /pkgs | |
| parent | f0a1ab78b492015f8a60bb49065579195fe1dc86 (diff) | |
| download | nixpkgs-4d858a2a17d1c65b4cabd43e5b63de3e58c0b12c.tar nixpkgs-4d858a2a17d1c65b4cabd43e5b63de3e58c0b12c.tar.gz nixpkgs-4d858a2a17d1c65b4cabd43e5b63de3e58c0b12c.tar.bz2 nixpkgs-4d858a2a17d1c65b4cabd43e5b63de3e58c0b12c.tar.lz nixpkgs-4d858a2a17d1c65b4cabd43e5b63de3e58c0b12c.tar.xz nixpkgs-4d858a2a17d1c65b4cabd43e5b63de3e58c0b12c.tar.zst nixpkgs-4d858a2a17d1c65b4cabd43e5b63de3e58c0b12c.zip | |
gdal: don't use composableDerivation
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/gdal/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/gdal/gdal-1_11.nix | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 0bb91951a28..984d3da8119 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, composableDerivation, unzip, libjpeg, libtiff, zlib +{ stdenv, fetchurl, unzip, libjpeg, libtiff, zlib , postgresql, mysql, libgeotiff, pythonPackages, proj, geos, openssl , libpng, sqlite, libspatialite, poppler, hdf4 , libiconv diff --git a/pkgs/development/libraries/gdal/gdal-1_11.nix b/pkgs/development/libraries/gdal/gdal-1_11.nix index 5ed72a6669c..c9f0c076101 100644 --- a/pkgs/development/libraries/gdal/gdal-1_11.nix +++ b/pkgs/development/libraries/gdal/gdal-1_11.nix @@ -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 , libpng }: -composableDerivation.composableDerivation {} (fixed: rec { +stdenv.mkDerivation rec { version = "1.11.3"; name = "gdal-${version}"; @@ -58,4 +58,4 @@ composableDerivation.composableDerivation {} (fixed: rec { maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; }; -}) +} |