diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1555d505b1a3..296303077077 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4285,6 +4285,7 @@ let stdenv = if stdenv.isDarwin then overrideGCC stdenv gccApple else stdenv; + automake = automake113x; }; glibmm = callPackage ../development/libraries/glibmm { }; @@ -5034,7 +5035,8 @@ let mesaSupported = lib.elem system lib.platforms.mesaPlatforms; mesa_original = callPackage ../development/libraries/mesa { }; - mesa_noglu = if stdenv.isDarwin then darwinX11AndOpenGL + mesa_noglu = if stdenv.isDarwin + then darwinX11AndOpenGL // { driverLink = mesa_noglu; } else mesa_original; mesa_drivers = mesa_original.drivers; mesa_glu = callPackage ../development/libraries/mesa-glu { }; @@ -5308,6 +5310,7 @@ let qt48 = callPackage ../development/libraries/qt-4.x/4.8 { # GNOME dependencies are not used unless gtkStyle == true + mesa = mesa_noglu; inherit (pkgs.gnome) libgnomeui GConf gnome_vfs; cups = if stdenv.isLinux then cups else null; @@ -5317,13 +5320,11 @@ let else stdenv; }; - qt48Full = lowPrio (callPackage ../development/libraries/qt-4.x/4.8 { - # GNOME dependencies are not used unless gtkStyle == true - inherit (pkgs.gnome) libgnomeui GConf gnome_vfs; + qt48Full = qt48.override { docs = true; demos = true; examples = true; - }); + }; qtscriptgenerator = callPackage ../development/libraries/qtscriptgenerator { }; @@ -5874,7 +5875,11 @@ let sip = callPackage ../development/python-modules/python-sip { }; - pyqt4 = callPackage ../development/python-modules/pyqt { }; + pyqt4 = callPackage ../development/python-modules/pyqt { + stdenv = if stdenv.isDarwin + then clangStdenv + else stdenv; + }; pysideApiextractor = callPackage ../development/python-modules/pyside/apiextractor.nix { }; @@ -9623,7 +9628,6 @@ let gensgs = callPackage_i686 ../misc/emulators/gens-gs { }; ghostscript = callPackage ../misc/ghostscript { - lcms = lcms2; x11Support = false; cupsSupport = config.ghostscript.cups or true; gnuFork = config.ghostscript.gnu or false; |