diff options
author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-01-27 04:17:36 +0100 |
---|---|---|
committer | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-01-27 04:17:36 +0100 |
commit | 43545381393695f722344b085620937fa3367a8a (patch) | |
tree | e2b7bdf1f0d5453341a4619f8a63948c6e6b2f76 /pkgs/top-level/all-packages.nix | |
parent | 4757f0e68df99bc7177c68dcc7c523e391d213cf (diff) | |
parent | 741c01dfc130418b134d48dfbb68f9462f853e32 (diff) |
Merge branch 'staging-next' into staging
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 73be578d96014..2073c4676a6e7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2014,8 +2014,6 @@ with pkgs; pferd = callPackage ../tools/misc/pferd { }; - pocket-updater-utility = callPackage ../tools/games/pocket-updater-utility { }; - polygon-cli = callPackage ../tools/networking/polygon-cli { }; pricehist = python3Packages.callPackage ../tools/misc/pricehist { }; @@ -16676,6 +16674,7 @@ with pkgs; buildLlvmTools = buildPackages.llvmPackages_11.tools; targetLlvmLibraries = targetPackages.llvmPackages_11.libraries or llvmPackages_11.libraries; targetLlvm = targetPackages.llvmPackages_11.llvm or llvmPackages_11.llvm; + stdenv = if stdenv.cc.cc.isGNU or false then gcc12Stdenv else stdenv; # does not build with gcc13 })); llvmPackages_12 = recurseIntoAttrs (callPackage ../development/compilers/llvm/12 ({ @@ -16683,6 +16682,7 @@ with pkgs; buildLlvmTools = buildPackages.llvmPackages_12.tools; targetLlvmLibraries = targetPackages.llvmPackages_12.libraries or llvmPackages_12.libraries; targetLlvm = targetPackages.llvmPackages_12.llvm or llvmPackages_12.llvm; + stdenv = if stdenv.cc.cc.isGNU or false then gcc12Stdenv else stdenv; # .libcxxabi does not build with gcc13 })); llvmPackages_13 = recurseIntoAttrs (callPackage ../development/compilers/llvm/13 ({ @@ -19738,14 +19738,7 @@ with pkgs; parse-cli-bin = callPackage ../development/tools/parse-cli-bin { }; - patchelf = if with stdenv.buildPlatform; isAarch64 && isMusl then - patchelf_0_13 - else - patchelfStable; - patchelf_0_13 = callPackage ../development/tools/misc/patchelf/0.13.nix { - patchelf = patchelfStable; - }; - patchelfStable = callPackage ../development/tools/misc/patchelf { }; + patchelf = callPackage ../development/tools/misc/patchelf { }; patchelfUnstable = lowPrio (callPackage ../development/tools/misc/patchelf/unstable.nix { }); @@ -20047,10 +20040,6 @@ with pkgs; sigrok-cli = callPackage ../development/tools/sigrok-cli { }; - silicon = callPackage ../tools/misc/silicon { - inherit (darwin.apple_sdk.frameworks) AppKit CoreText Security; - }; - simpleTpmPk11 = callPackage ../tools/security/simple-tpm-pk11 { }; slimerjs = callPackage ../development/tools/slimerjs { }; @@ -30666,8 +30655,6 @@ with pkgs; bleachbit = callPackage ../applications/misc/bleachbit { }; blender = callPackage ../applications/misc/blender { - # LLVM 11 crashes when compiling GHOST_SystemCocoa.mm - stdenv = if stdenv.isDarwin then llvmPackages_10.stdenv else stdenv; openexr = openexr_3; inherit (darwin.apple_sdk.frameworks) Cocoa CoreGraphics ForceFeedback OpenAL OpenGL; }; @@ -32140,8 +32127,6 @@ with pkgs; mi2ly = callPackage ../applications/audio/mi2ly { }; - moe = callPackage ../applications/editors/moe { }; - molsketch = libsForQt5.callPackage ../applications/editors/molsketch { }; multiviewer-for-f1 = callPackage ../applications/video/multiviewer-for-f1 { }; @@ -35541,8 +35526,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; }; - sunvox = callPackage ../applications/audio/sunvox { }; - supersonic-wayland = supersonic.override { waylandSupport = true; }; |