diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2020-02-02 15:35:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-02 15:35:18 +0100 |
| commit | c195ef6aab79b8194158b0b2fadbf96f986b14c8 (patch) | |
| tree | 862fd15e050242564d468d247099b1a4b1fb571e /pkgs/top-level | |
| parent | 26aba55951a09340959b68330875904ac43a3a31 (diff) | |
| parent | 5cc0468a206c93ff246605a18eff562619d5a3b7 (diff) | |
| download | nixlib-c195ef6aab79b8194158b0b2fadbf96f986b14c8.tar nixlib-c195ef6aab79b8194158b0b2fadbf96f986b14c8.tar.gz nixlib-c195ef6aab79b8194158b0b2fadbf96f986b14c8.tar.bz2 nixlib-c195ef6aab79b8194158b0b2fadbf96f986b14c8.tar.lz nixlib-c195ef6aab79b8194158b0b2fadbf96f986b14c8.tar.xz nixlib-c195ef6aab79b8194158b0b2fadbf96f986b14c8.tar.zst nixlib-c195ef6aab79b8194158b0b2fadbf96f986b14c8.zip | |
Merge pull request #78928 from NixOS/staging-next
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 87e4235cf339..18490bd760e6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8442,7 +8442,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 @@ -15449,6 +15455,8 @@ in inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit Cocoa; }; + qpaeq = qt5.callPackage ../servers/pulseaudio/qpaeq.nix { }; + pulseaudioFull = pulseaudio.override { x11Support = true; jackaudioSupport = true; |