diff options
| author | Ben Siraphob <bensiraphob@gmail.com> | 2021-02-20 21:01:53 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-20 16:01:53 -0500 |
| commit | 127733211e03cb0763246a2ebc0c99e2a438a6ce (patch) | |
| tree | aa9601b7da78a16d08e713e4d5e01ffe39dfd8b2 /pkgs/development/tools/ocaml/opam | |
| parent | ce5052e93174070b3648e02bd3c787668331e9b5 (diff) | |
| download | nixpkgs-127733211e03cb0763246a2ebc0c99e2a438a6ce.tar nixpkgs-127733211e03cb0763246a2ebc0c99e2a438a6ce.tar.gz nixpkgs-127733211e03cb0763246a2ebc0c99e2a438a6ce.tar.bz2 nixpkgs-127733211e03cb0763246a2ebc0c99e2a438a6ce.tar.lz nixpkgs-127733211e03cb0763246a2ebc0c99e2a438a6ce.tar.xz nixpkgs-127733211e03cb0763246a2ebc0c99e2a438a6ce.tar.zst nixpkgs-127733211e03cb0763246a2ebc0c99e2a438a6ce.zip | |
treewide: unzip buildInputs to nativeBuildInputs (#112302)
Diffstat (limited to 'pkgs/development/tools/ocaml/opam')
| -rw-r--r-- | pkgs/development/tools/ocaml/opam/1.2.2.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/tools/ocaml/opam/default.nix | 4 | ||||
| -rwxr-xr-x | pkgs/development/tools/ocaml/opam/opam.nix.pl | 3 |
3 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/development/tools/ocaml/opam/1.2.2.nix b/pkgs/development/tools/ocaml/opam/1.2.2.nix index 610093af19f..60804684ccb 100644 --- a/pkgs/development/tools/ocaml/opam/1.2.2.nix +++ b/pkgs/development/tools/ocaml/opam/1.2.2.nix @@ -47,8 +47,8 @@ in stdenv.mkDerivation { pname = "opam"; version = "1.2.2"; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ unzip curl ncurses ocaml ]; + nativeBuildInputs = [ makeWrapper unzip ]; + buildInputs = [ curl ncurses ocaml ]; src = srcs.opam; diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix index 30bc089ee0f..bd33d4cc1d3 100644 --- a/pkgs/development/tools/ocaml/opam/default.nix +++ b/pkgs/development/tools/ocaml/opam/default.nix @@ -63,8 +63,8 @@ in stdenv.mkDerivation { pname = "opam"; version = "2.0.8"; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ unzip curl ncurses ocaml getconf ] ++ lib.optional stdenv.isLinux bubblewrap; + nativeBuildInputs = [ makeWrapper unzip ]; + buildInputs = [ curl ncurses ocaml getconf ] ++ lib.optional stdenv.isLinux bubblewrap; src = srcs.opam; diff --git a/pkgs/development/tools/ocaml/opam/opam.nix.pl b/pkgs/development/tools/ocaml/opam/opam.nix.pl index b94aa7dd9a2..bfaea0c7ef3 100755 --- a/pkgs/development/tools/ocaml/opam/opam.nix.pl +++ b/pkgs/development/tools/ocaml/opam/opam.nix.pl @@ -68,7 +68,8 @@ in stdenv.mkDerivation { pname = "opam"; version = "$OPAM_RELEASE"; - buildInputs = [ unzip curl ncurses ocaml makeWrapper getconf ] ++ lib.optional stdenv.isLinux bubblewrap; + nativeBuildInputs = [ unzip ]; + buildInputs = [ curl ncurses ocaml makeWrapper getconf ] ++ lib.optional stdenv.isLinux bubblewrap; src = srcs.opam; |