diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-01-31 00:16:31 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-01-31 00:16:31 +0100 |
| commit | 5cc0468a206c93ff246605a18eff562619d5a3b7 (patch) | |
| tree | b845e8566f5f895d9b4fe451bb40e5a816670de7 /pkgs/top-level | |
| parent | 035bbb336aecc791ba3917f39653e7b6fa00036b (diff) | |
| parent | 1a3a0e818144629b6b3dd8fbe174dc867aabdbf1 (diff) | |
| download | nixlib-5cc0468a206c93ff246605a18eff562619d5a3b7.tar nixlib-5cc0468a206c93ff246605a18eff562619d5a3b7.tar.gz nixlib-5cc0468a206c93ff246605a18eff562619d5a3b7.tar.bz2 nixlib-5cc0468a206c93ff246605a18eff562619d5a3b7.tar.lz nixlib-5cc0468a206c93ff246605a18eff562619d5a3b7.tar.xz nixlib-5cc0468a206c93ff246605a18eff562619d5a3b7.tar.zst nixlib-5cc0468a206c93ff246605a18eff562619d5a3b7.zip | |
Merge staging into staging-next
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 92d90410ee1e..5e3e48c43783 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8441,7 +8441,13 @@ in jre = jre8; jre_headless = jre8_headless; - inherit (callPackages ../development/compilers/graalvm { }) mx jvmci8 graalvm8; + inherit (callPackages ../development/compilers/graalvm { + gcc = if stdenv.targetPlatform.isDarwin then gcc8 else gcc; + inherit (darwin.apple_sdk.frameworks) + CoreFoundation Foundation JavaNativeFoundation + JavaVM JavaRuntimeSupport Cocoa; + inherit (darwin) libiconv libobjc libresolv; + }) mx jvmci8 graalvm8; inherit (callPackages ../development/compilers/graalvm/enterprise-edition.nix { }) graalvm8-ee @@ -15475,6 +15481,8 @@ in inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit Cocoa; }; + qpaeq = qt5.callPackage ../servers/pulseaudio/qpaeq.nix { }; + pulseaudioFull = pulseaudio.override { x11Support = true; jackaudioSupport = true; |