public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #97630 from treed/zhf-rpm-darwin

Browse Source 
rpm: add openmp when building with clang
This commit is contained in:
Robert Scott
2020-09-10 20:38:23 +01:00
committed by GitHub
parent 065b4af1c7 b8e0f0cd72
commit 140b8718fb
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/tools/package-management/rpm/default.nix
View File

@@ -1,6 +1,6 @@
{ stdenv, lib
, pkgconfig, autoreconfHook
, fetchurl, cpio, zlib, bzip2, file, elfutils, libbfd, libarchive, nspr, nss, popt, db, xz, python, lua
, fetchurl, cpio, zlib, bzip2, file, elfutils, libbfd, libarchive, nspr, nss, popt, db, xz, python, lua, llvmPackages
}:
stdenv.mkDerivation rec {
@@ -15,7 +15,8 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" "man" ];
nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ cpio zlib bzip2 file libarchive nspr nss db xz python lua ];
buildInputs = [ cpio zlib bzip2 file libarchive nspr nss db xz python lua ]
++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ];
# rpm/rpmlib.h includes popt.h, and then the pkg-config file mentions these as linkage requirements
propagatedBuildInputs = [ popt nss db bzip2 libarchive libbfd ]