diff options
| author | Vladimír Čunát <v@cunat.cz> | 2024-04-17 08:03:50 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2024-04-17 08:03:50 +0200 |
| commit | 73f2b40dfc3413958695ae66fca3a52ee68451d6 (patch) | |
| tree | b1ce002a50ee1d0e505dff916ce9d38f07e9efc6 /pkgs/top-level/all-packages.nix | |
| parent | 4c3d3c027edc51afc1008fd1a9158c0236cf4b52 (diff) | |
| parent | ab7b278a52a5e09353341c72daaa8074b6ad4e90 (diff) | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8a27716c280c8..972c88222dca8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14385,7 +14385,8 @@ with pkgs; wasm-tools = callPackage ../tools/misc/wasm-tools { }; - wasmedge = darwin.apple_sdk_11_0.callPackage ../development/tools/wasmedge { + wasmedge = callPackage ../development/tools/wasmedge { + stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else llvmPackages.stdenv; inherit (darwin.apple_sdk_11_0.frameworks) Foundation; }; @@ -34414,7 +34415,12 @@ with pkgs; rtl-ais = callPackage ../applications/radio/rtl-ais { }; - rtl-sdr = callPackage ../applications/radio/rtl-sdr { }; + inherit (callPackages ../applications/radio/rtl-sdr { }) + rtl-sdr-librtlsdr + rtl-sdr-osmocom + rtl-sdr-blog; + + rtl-sdr = rtl-sdr-blog; rubyripper = callPackage ../applications/audio/rubyripper { }; @@ -38919,9 +38925,7 @@ with pkgs; btor2tools = callPackage ../applications/science/logic/btor2tools { }; - boolector = callPackage ../applications/science/logic/boolector { - stdenv = if stdenv.cc.isClang then overrideLibcxx llvmPackages_14.stdenv else stdenv; - }; + boolector = callPackage ../applications/science/logic/boolector { }; bitwuzla = callPackage ../applications/science/logic/bitwuzla { }; |