diff options
| author | Théo Zimmermann <theo.zimmermann@inria.fr> | 2021-09-07 14:44:40 +0200 |
|---|---|---|
| committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2021-09-20 11:10:23 +0200 |
| commit | 20291381c1e79eda0d5efbf3470440f270a7dee6 (patch) | |
| tree | 59b042dc0641a39f259a8db2771bf3cfcdafd00b /pkgs/build-support/coq/default.nix | |
| parent | e331c30a724090818bb8d8976c746b38ca57cbfa (diff) | |
| download | nixpkgs-20291381c1e79eda0d5efbf3470440f270a7dee6.tar nixpkgs-20291381c1e79eda0d5efbf3470440f270a7dee6.tar.gz nixpkgs-20291381c1e79eda0d5efbf3470440f270a7dee6.tar.bz2 nixpkgs-20291381c1e79eda0d5efbf3470440f270a7dee6.tar.lz nixpkgs-20291381c1e79eda0d5efbf3470440f270a7dee6.tar.xz nixpkgs-20291381c1e79eda0d5efbf3470440f270a7dee6.tar.zst nixpkgs-20291381c1e79eda0d5efbf3470440f270a7dee6.zip | |
coqPackages.mkCoqDerivation: rely on namePrefix to compute default opam-name
As suggested by Cyril Cohen in https://github.com/NixOS/nixpkgs/pull/134362#discussion_r698379405.
Diffstat (limited to 'pkgs/build-support/coq/default.nix')
| -rw-r--r-- | pkgs/build-support/coq/default.nix | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/build-support/coq/default.nix b/pkgs/build-support/coq/default.nix index 05f6e7762a0..569b07cded6 100644 --- a/pkgs/build-support/coq/default.nix +++ b/pkgs/build-support/coq/default.nix @@ -16,7 +16,7 @@ in displayVersion ? {}, release ? {}, extraBuildInputs ? [], - namePrefix ? [], + namePrefix ? [ "coq" ], enableParallelBuilding ? true, extraInstallFlags ? [], setCOQBIN ? true, @@ -27,7 +27,7 @@ in dropDerivationAttrs ? [], useDune2ifVersion ? (x: false), useDune2 ? false, - opam-name ? "coq-${pname}", + opam-name ? (concatStringsSep "-" (namePrefix ++ [ pname ])), ... }@args: let @@ -44,7 +44,6 @@ let location = { inherit domain owner repo; }; } // optionalAttrs (args?fetcher) {inherit fetcher;}); fetched = fetch (if !isNull version then version else defaultVersion); - namePrefix = args.namePrefix or [ "coq" ]; display-pkg = n: sep: v: let d = displayVersion.${n} or (if sep == "" then ".." else true); in n + optionalString (v != "" && v != null) (switch d [ |