diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1baef6881c2b..06a70709d84e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4148,6 +4148,8 @@ with pkgs; odpdown = callPackage ../tools/typesetting/odpdown { }; + odpic = callPackage ../development/libraries/odpic { }; + odt2txt = callPackage ../tools/text/odt2txt { }; offlineimap = callPackage ../tools/networking/offlineimap { }; @@ -7503,9 +7505,11 @@ with pkgs; spidermonkey_1_8_5 = callPackage ../development/interpreters/spidermonkey/1.8.5.nix { }; spidermonkey_17 = callPackage ../development/interpreters/spidermonkey/17.nix { }; spidermonkey_31 = callPackage ../development/interpreters/spidermonkey/31.nix { }; - spidermonkey_38 = callPackage ../development/interpreters/spidermonkey/38.nix { + spidermonkey_38 = callPackage ../development/interpreters/spidermonkey/38.nix ({ inherit (darwin) libobjc; - }; + } // (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { + stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4' + })); spidermonkey_52 = callPackage ../development/interpreters/spidermonkey/52.nix { }; spidermonkey = spidermonkey_31; @@ -16298,6 +16302,7 @@ with pkgs; }; hello = callPackage ../applications/misc/hello { }; + hello-unfree = callPackage ../applications/misc/hello-unfree { }; helmholtz = callPackage ../applications/audio/pd-plugins/helmholtz { }; @@ -17185,7 +17190,9 @@ with pkgs; inherit (gnome3) libgee; }; - synapse-bt = callPackage ../applications/networking/p2p/synapse-bt { }; + synapse-bt = callPackage ../applications/networking/p2p/synapse-bt { + inherit (darwin.apple_sdk.frameworks) Security; + }; synfigstudio = callPackage ../applications/graphics/synfigstudio { fontsConf = makeFontsConf { fontDirectories = [ freefont_ttf ]; }; |