diff options
| author | sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> | 2021-06-21 14:05:57 +0200 |
|---|---|---|
| committer | sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> | 2021-06-21 14:08:41 +0200 |
| commit | 5e0c55b5818f5ade85536dc6e9661f4ad545e4ca (patch) | |
| tree | 02a8a00704cf47c2df74e690f70b4f4b32e0de47 /pkgs/development/haskell-modules/generic-builder.nix | |
| parent | 29229016f92a23391f71d9f4c4dab82cfcb8ebac (diff) | |
| download | nixpkgs-5e0c55b5818f5ade85536dc6e9661f4ad545e4ca.tar nixpkgs-5e0c55b5818f5ade85536dc6e9661f4ad545e4ca.tar.gz nixpkgs-5e0c55b5818f5ade85536dc6e9661f4ad545e4ca.tar.bz2 nixpkgs-5e0c55b5818f5ade85536dc6e9661f4ad545e4ca.tar.lz nixpkgs-5e0c55b5818f5ade85536dc6e9661f4ad545e4ca.tar.xz nixpkgs-5e0c55b5818f5ade85536dc6e9661f4ad545e4ca.tar.zst nixpkgs-5e0c55b5818f5ade85536dc6e9661f4ad545e4ca.zip | |
haskell-generic-builder: pass pname and version as is
This is a full set rebuild, however it improves the name generation for the static and cross case since the respective additional components are now inserted between pname and version instead of after name like before. This prevents builtins.parseDrvName from mistaking a platform config string for a version component.
Diffstat (limited to 'pkgs/development/haskell-modules/generic-builder.nix')
| -rw-r--r-- | pkgs/development/haskell-modules/generic-builder.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 2b2f23e20ea..bc0d0958902 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -289,7 +289,7 @@ in lib.fix (drv: assert allPkgconfigDepends != [] -> pkg-config != null; stdenv.mkDerivation ({ - name = "${pname}-${version}"; + inherit pname version; outputs = [ "out" ] ++ (optional enableSeparateDataOutput "data") |