diff options
| author | Theodore Ni <3806110+tjni@users.noreply.github.com> | 2023-08-06 02:29:16 -0700 |
|---|---|---|
| committer | Theodore Ni <3806110+tjni@users.noreply.github.com> | 2023-08-06 02:29:16 -0700 |
| commit | 060c8f587503538cd860782ecd7f915def45fae5 (patch) | |
| tree | c498433c1e30fb5e5523cf911906f7186c0bc1df | |
| parent | dcead249ccf7cb008e2242f64a3935c315b3644e (diff) | |
| download | nixpkgs-060c8f587503538cd860782ecd7f915def45fae5.tar nixpkgs-060c8f587503538cd860782ecd7f915def45fae5.tar.gz nixpkgs-060c8f587503538cd860782ecd7f915def45fae5.tar.bz2 nixpkgs-060c8f587503538cd860782ecd7f915def45fae5.tar.lz nixpkgs-060c8f587503538cd860782ecd7f915def45fae5.tar.xz nixpkgs-060c8f587503538cd860782ecd7f915def45fae5.tar.zst nixpkgs-060c8f587503538cd860782ecd7f915def45fae5.zip | |
edk2: fix x86_64-darwin build
| -rw-r--r-- | pkgs/development/compilers/edk2/default.nix | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/pkgs/development/compilers/edk2/default.nix b/pkgs/development/compilers/edk2/default.nix index 34b75b05d87..3a039014db8 100644 --- a/pkgs/development/compilers/edk2/default.nix +++ b/pkgs/development/compilers/edk2/default.nix @@ -5,7 +5,6 @@ , libuuid , python3 , bc -, llvmPackages_9 , lib , buildPackages }: @@ -24,17 +23,12 @@ else if stdenv.isAarch64 then else throw "Unsupported architecture"; -buildStdenv = if stdenv.isDarwin then - llvmPackages_9.stdenv -else - stdenv; - buildType = if stdenv.isDarwin then "CLANGPDB" else "GCC5"; -edk2 = buildStdenv.mkDerivation { +edk2 = stdenv.mkDerivation { pname = "edk2"; version = "202305"; @@ -42,7 +36,7 @@ edk2 = buildStdenv.mkDerivation { # pass targetPrefix as an env var (fetchpatch { url = "https://src.fedoraproject.org/rpms/edk2/raw/08f2354cd280b4ce5a7888aa85cf520e042955c3/f/0021-Tweak-the-tools_def-to-support-cross-compiling.patch"; - sha256 = "sha256-E1/fiFNVx0aB1kOej2DJ2DlBIs9tAAcxoedym2Zhjxw="; + hash = "sha256-E1/fiFNVx0aB1kOej2DJ2DlBIs9tAAcxoedym2Zhjxw="; }) ]; @@ -62,8 +56,7 @@ edk2 = buildStdenv.mkDerivation { # trick taken from https://src.fedoraproject.org/rpms/edk2/blob/08f2354cd280b4ce5a7888aa85cf520e042955c3/f/edk2.spec#_319 ${"GCC5_${targetArch}_PREFIX"}=stdenv.cc.targetPrefix; - makeFlags = [ "-C BaseTools" ] - ++ lib.optionals (stdenv.cc.isClang) [ "CXX=llvm BUILD_AR=ar BUILD_CC=clang BUILD_CXX=clang++ BUILD_AS=clang BUILD_LD=ld" ]; + makeFlags = [ "-C BaseTools" ]; env.NIX_CFLAGS_COMPILE = "-Wno-return-type" + lib.optionalString (stdenv.cc.isGNU) " -Wno-error=stringop-truncation"; @@ -89,7 +82,7 @@ edk2 = buildStdenv.mkDerivation { }; passthru = { - mkDerivation = projectDscPath: attrsOrFun: buildStdenv.mkDerivation (finalAttrs: + mkDerivation = projectDscPath: attrsOrFun: stdenv.mkDerivation (finalAttrs: let attrs = lib.toFunction attrsOrFun finalAttrs; in |