diff options
author | Alyssa Ross <hi@alyssa.is> | 2020-01-11 23:37:02 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2020-01-11 23:41:30 +0000 |
commit | 6c557e3f1c28cf87e9fba232811d6875dd1399c1 (patch) | |
tree | 035a071d5d8980df6de0fa42e2ef8fc0cce7055e /nixpkgs/pkgs/development/ocaml-modules/camlzip | |
parent | da7500bc026e937ac7fce7b50f67a0e1765737a7 (diff) | |
parent | e4134747f5666bcab8680aff67fa3b63384f9a0f (diff) | |
download | nixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.tar nixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.tar.gz nixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.tar.bz2 nixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.tar.lz nixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.tar.xz nixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.tar.zst nixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.zip |
Merge commit 'e4134747f5666bcab8680aff67fa3b63384f9a0f'
Diffstat (limited to 'nixpkgs/pkgs/development/ocaml-modules/camlzip')
-rw-r--r-- | nixpkgs/pkgs/development/ocaml-modules/camlzip/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/development/ocaml-modules/camlzip/default.nix b/nixpkgs/pkgs/development/ocaml-modules/camlzip/default.nix index c1490c3bf196..7de8968e0610 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/camlzip/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/camlzip/default.nix @@ -8,14 +8,14 @@ let url = "https://github.com/xavierleroy/camlzip/archive/rel107.tar.gz"; sha256 = "1pdz3zyiczm6c46zfgag2frwq3ljlq044p3a2y4wm2wb4pgz8k9g"; patches = []; - installTargets = "install-findlib"; + installTargets = [ "install-findlib" ]; } else { version = "1.05"; download_id = "1037"; url = "http://forge.ocamlcore.org/frs/download.php/${param.download_id}/camlzip-${param.version}.tar.gz"; sha256 = "930b70c736ab5a7ed1b05220102310a0a2241564786657abe418e834a538d06b"; patches = [./makefile_1_05.patch]; - installTargets = "install"; + installTargets = [ "install" ]; }; in @@ -42,7 +42,7 @@ stdenv.mkDerivation { --subst-var-by ZLIB_INCLUDE "${zlib.dev}/include" ''; - buildFlags = "all allopt"; + buildFlags = [ "all" "allopt" ]; inherit (param) installTargets; @@ -61,7 +61,7 @@ stdenv.mkDerivation { license = "LGPL+linking exceptions"; platforms = ocaml.meta.platforms or []; maintainers = [ - stdenv.lib.maintainers.z77z + stdenv.lib.maintainers.maggesi ]; }; } |