Unverified Commit 84011615 authored by Jan Tojnar's avatar Jan Tojnar Committed by GitHub
Browse files

Merge pull request #96120 from jtojnar/cleaner-wx

parents 88bf6211 2fd206f7

pkgs/development/libraries/wxwidgets/2.8/default.nix

+2 −2
Original line number Diff line number Diff line 
{ stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xorgproto

, gstreamer, gst-plugins-base, GConf, libX11, cairo

, libX11, cairo

, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms

, withMesa ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms

, libGLU ? null, libGL ? null
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec { 
    sha256 = "1l1w4i113csv3bd5r8ybyj0qpxdq83lj6jrc5p7cc10mkwyiagqz";

  };



  buildInputs = [ gtk2 libXinerama libSM libXxf86vm xorgproto gstreamer gst-plugins-base GConf libX11 cairo ]

  buildInputs = [ gtk2 libXinerama libSM libXxf86vm xorgproto libX11 cairo ]

    ++ optional withMesa libGLU;



  nativeBuildInputs = [ pkgconfig ];

pkgs/development/libraries/wxwidgets/2.9/default.nix

+3 −4
Original line number Diff line number Diff line 
{ stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xorgproto

, gstreamer, gst-plugins-base, GConf, setfile

, setfile

, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms

, withMesa ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms

, libGLU ? null, libGL ? null
@@ -32,8 +32,7 @@ stdenv.mkDerivation { 
  ];



  buildInputs =

    [ gtk2 libXinerama libSM libXxf86vm xorgproto gstreamer

      gst-plugins-base GConf ]

    [ gtk2 libXinerama libSM libXxf86vm xorgproto ]

    ++ optional withMesa libGLU

    ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QuickTime ];
@@ -42,7 +41,7 @@ stdenv.mkDerivation { 
  propagatedBuildInputs = optional stdenv.isDarwin AGL;



  configureFlags =

    [ "--enable-gtk2" "--disable-precomp-headers" "--enable-mediactrl"

    [ "--enable-gtk2" "--disable-precomp-headers"

      (if compat24 then "--enable-compat24" else "--disable-compat24")

      (if compat26 then "--enable-compat26" else "--disable-compat26") ]

    ++ optional unicode "--enable-unicode"

pkgs/development/libraries/wxwidgets/3.0/default.nix

+2 −2
Original line number Diff line number Diff line 
{ stdenv, fetchFromGitHub, fetchurl, pkgconfig

, libXinerama, libSM, libXxf86vm

, gtk2, GConf ? null, gtk3

, gtk2, gtk3

, xorgproto, gst_all_1, setfile

, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms

, withMesa ? libGLSupported
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec { 


  buildInputs = [

    libXinerama libSM libXxf86vm xorgproto gst_all_1.gstreamer gst_all_1.gst-plugins-base

  ] ++ optionals withGtk2 [ gtk2 GConf ]

  ] ++ optionals withGtk2 [ gtk2 ]

    ++ optional (!withGtk2) gtk3

    ++ optional withMesa libGLU

    ++ optional withWebKit webkitgtk

pkgs/development/libraries/wxwidgets/3.1/default.nix

+2 −2
Original line number Diff line number Diff line 
{ stdenv, fetchFromGitHub, fetchurl, pkgconfig

, libXinerama, libSM, libXxf86vm

, gtk2, GConf ? null, gtk3

, gtk2, gtk3

, xorgproto, gst_all_1, setfile

, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms

, withMesa ? libGLSupported, libGLU ? null, libGL ? null
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec { 


  buildInputs = [

    libXinerama libSM libXxf86vm xorgproto gst_all_1.gstreamer gst_all_1.gst-plugins-base

  ] ++ optionals withGtk2 [ gtk2 GConf ]

  ] ++ optionals withGtk2 [ gtk2 ]

    ++ optional (!withGtk2) gtk3

    ++ optional withMesa libGLU

    ++ optional withWebKit webkitgtk

pkgs/top-level/all-packages.nix

+1 −7
Original line number Diff line number Diff line
@@ -15716,19 +15716,15 @@ in 
  wxGTK30 = wxGTK30-gtk2;

  wxGTK31 = wxGTK31-gtk2;













  wxGTK28 = callPackage ../development/libraries/wxwidgets/2.8 {













    inherit (gnome2) GConf;













  };













  wxGTK28 = callPackage ../development/libraries/wxwidgets/2.8 { };





























  wxGTK29 = callPackage ../development/libraries/wxwidgets/2.9 {













    inherit (gnome2) GConf;















    inherit (darwin.stubs) setfile;















    inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QuickTime;















  };





























  wxGTK30-gtk2 = callPackage ../development/libraries/wxwidgets/3.0 {















    withGtk2 = true;













    inherit (gnome2) GConf;















    inherit (darwin.stubs) setfile;















    inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit;















  };









@@ -15741,7 +15737,6 @@ in



























  wxGTK31-gtk2 = callPackage ../development/libraries/wxwidgets/3.1 {















    withGtk2 = true;













    inherit (gnome2) GConf;















    inherit (darwin.stubs) setfile;















    inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit;















  };










@@ -24637,7 +24632,6 @@ in













  fsg = callPackage ../games/fsg {















    wxGTK = wxGTK28.override {















      unicode = false;













      gst-plugins-base = null;















    };















  };