From 8e716103ee02f4a29d44240988d04e08607020cf Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Sun, 30 Mar 2025 21:21:20 -0700 Subject: [PATCH] llvmPackages_{12,13,14,15,16,17,18,19,20,git}.openmp: move pname --- .../compilers/llvm/common/openmp/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/compilers/llvm/common/openmp/default.nix b/pkgs/development/compilers/llvm/common/openmp/default.nix index 44a9597e7fd4..81525e4afe9e 100644 --- a/pkgs/development/compilers/llvm/common/openmp/default.nix +++ b/pkgs/development/compilers/llvm/common/openmp/default.nix @@ -24,24 +24,24 @@ assert lib.assertMsg (ompdGdbSupport -> ompdSupport) "OMPD GDB support requires OMPD support!"; +stdenv.mkDerivation (finalAttrs: let - pname = "openmp"; src' = if monorepoSrc != null then - runCommand "${pname}-src-${version}" { inherit (monorepoSrc) passthru; } ('' + runCommand "openmp-src-${version}" { inherit (monorepoSrc) passthru; } ('' mkdir -p "$out" '' + lib.optionalString (lib.versionAtLeast release_version "14") '' cp -r ${monorepoSrc}/cmake "$out" '' + '' - cp -r ${monorepoSrc}/${pname} "$out" + cp -r ${monorepoSrc}/openmp "$out" '') else src; -in -stdenv.mkDerivation (finalAttrs: { - inherit pname version; +in { + pname = "openmp"; + inherit version; src = src'; - sourceRoot = "${finalAttrs.src.name}/${finalAttrs.pname}"; + sourceRoot = "${finalAttrs.src.name}/openmp"; outputs = [ "out" ] ++ lib.optionals (lib.versionAtLeast release_version "14") [ "dev" ];