Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b710d86a3f60
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 63150762bafc
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Apr 12, 2017

  1. qt4: enable gtk2 by default

    @abbradar
    abbradar committed Apr 12, 2017
    Copy the full SHA
    b525898 View commit details

Commits on May 18, 2017

  1. Merge pull request #24861 from abbradar/qt4-gtk 

    qt4: enable gtk2 by default
    @abbradar
    abbradar authored May 18, 2017
    Copy the full SHA
    6315076 View commit details
Showing with 6 additions and 4 deletions.
  1. +6 −4 pkgs/development/libraries/qt-4.x/4.8/default.nix
10 changes: 6 additions & 4 deletions pkgs/development/libraries/qt-4.x/4.8/default.nix
View file
Original file line number Diff line number Diff line change
@@ -6,7 +6,8 @@
, buildMultimedia ? stdenv.isLinux, alsaLib, gstreamer, gst-plugins-base
, buildWebkit ? (stdenv.isLinux || stdenv.isDarwin)
, flashplayerFix ? false, gdk_pixbuf
, gtkStyle ? false, libgnomeui, gtk2, GConf, gnome_vfs
, gtkStyle ? true, gtk2
, gnomeStyle ? false, libgnomeui, GConf, gnome_vfs
, developerBuild ? false
, docs ? false
, examples ? false
@@ -73,14 +74,15 @@ stdenv.mkDerivation rec {
glibc = stdenv.cc.libc.out;
openglDriver = if mesaSupported then mesa.driverLink else "/no-such-path";
})
] ++ stdenv.lib.optional gtkStyle (substituteAll {
] ++ stdenv.lib.optional gtkStyle (substituteAll ({
src = ./dlopen-gtkstyle.diff;
# substituteAll ignores env vars starting with capital letter
gconf = GConf.out;
gtk = gtk2.out;
} // stdenv.lib.optionalAttrs gnomeStyle {
gconf = GConf.out;
libgnomeui = libgnomeui.out;
gnome_vfs = gnome_vfs.out;
})
}))
++ stdenv.lib.optional flashplayerFix (substituteAll {
src = ./dlopen-webkit-nsplugin.diff;
gtk = gtk2.out;