commit 840116150c162d0fca5d2e596664442e4cc38e7b · pyrox.dev/nixpkgs

+2 -2

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

··· 1 { stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xorgproto 2 - , gstreamer, gst-plugins-base, GConf, libX11, cairo 3 , libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms 4 , withMesa ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms 5 , libGLU ? null, libGL ? null ··· 19 sha256 = "1l1w4i113csv3bd5r8ybyj0qpxdq83lj6jrc5p7cc10mkwyiagqz"; 20 }; 21 22 - buildInputs = [ gtk2 libXinerama libSM libXxf86vm xorgproto gstreamer gst-plugins-base GConf libX11 cairo ] 23 ++ optional withMesa libGLU; 24 25 nativeBuildInputs = [ pkgconfig ];

··· 1 { stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xorgproto 2 + , libX11, cairo 3 , libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms 4 , withMesa ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms 5 , libGLU ? null, libGL ? null ··· 19 sha256 = "1l1w4i113csv3bd5r8ybyj0qpxdq83lj6jrc5p7cc10mkwyiagqz"; 20 }; 21 22 + buildInputs = [ gtk2 libXinerama libSM libXxf86vm xorgproto libX11 cairo ] 23 ++ optional withMesa libGLU; 24 25 nativeBuildInputs = [ pkgconfig ];

+3 -4

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

··· 1 { stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xorgproto 2 - , gstreamer, gst-plugins-base, GConf, setfile 3 , libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms 4 , withMesa ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms 5 , libGLU ? null, libGL ? null ··· 32 ]; 33 34 buildInputs = 35 - [ gtk2 libXinerama libSM libXxf86vm xorgproto gstreamer 36 - gst-plugins-base GConf ] 37 ++ optional withMesa libGLU 38 ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QuickTime ]; 39 ··· 42 propagatedBuildInputs = optional stdenv.isDarwin AGL; 43 44 configureFlags = 45 - [ "--enable-gtk2" "--disable-precomp-headers" "--enable-mediactrl" 46 (if compat24 then "--enable-compat24" else "--disable-compat24") 47 (if compat26 then "--enable-compat26" else "--disable-compat26") ] 48 ++ optional unicode "--enable-unicode"

··· 1 { stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xorgproto 2 + , setfile 3 , libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms 4 , withMesa ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms 5 , libGLU ? null, libGL ? null ··· 32 ]; 33 34 buildInputs = 35 + [ gtk2 libXinerama libSM libXxf86vm xorgproto ] 36 ++ optional withMesa libGLU 37 ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QuickTime ]; 38 ··· 41 propagatedBuildInputs = optional stdenv.isDarwin AGL; 42 43 configureFlags = 44 + [ "--enable-gtk2" "--disable-precomp-headers" 45 (if compat24 then "--enable-compat24" else "--disable-compat24") 46 (if compat26 then "--enable-compat26" else "--disable-compat26") ] 47 ++ optional unicode "--enable-unicode"

+2 -2

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

··· 1 { stdenv, fetchFromGitHub, fetchurl, pkgconfig 2 , libXinerama, libSM, libXxf86vm 3 - , gtk2, GConf ? null, gtk3 4 , xorgproto, gst_all_1, setfile 5 , libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms 6 , withMesa ? libGLSupported ··· 31 32 buildInputs = [ 33 libXinerama libSM libXxf86vm xorgproto gst_all_1.gstreamer gst_all_1.gst-plugins-base 34 - ] ++ optionals withGtk2 [ gtk2 GConf ] 35 ++ optional (!withGtk2) gtk3 36 ++ optional withMesa libGLU 37 ++ optional withWebKit webkitgtk

··· 1 { stdenv, fetchFromGitHub, fetchurl, pkgconfig 2 , libXinerama, libSM, libXxf86vm 3 + , gtk2, gtk3 4 , xorgproto, gst_all_1, setfile 5 , libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms 6 , withMesa ? libGLSupported ··· 31 32 buildInputs = [ 33 libXinerama libSM libXxf86vm xorgproto gst_all_1.gstreamer gst_all_1.gst-plugins-base 34 + ] ++ optionals withGtk2 [ gtk2 ] 35 ++ optional (!withGtk2) gtk3 36 ++ optional withMesa libGLU 37 ++ optional withWebKit webkitgtk

+2 -2

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

··· 1 { stdenv, fetchFromGitHub, fetchurl, pkgconfig 2 , libXinerama, libSM, libXxf86vm 3 - , gtk2, GConf ? null, gtk3 4 , xorgproto, gst_all_1, setfile 5 , libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms 6 , withMesa ? libGLSupported, libGLU ? null, libGL ? null ··· 30 31 buildInputs = [ 32 libXinerama libSM libXxf86vm xorgproto gst_all_1.gstreamer gst_all_1.gst-plugins-base 33 - ] ++ optionals withGtk2 [ gtk2 GConf ] 34 ++ optional (!withGtk2) gtk3 35 ++ optional withMesa libGLU 36 ++ optional withWebKit webkitgtk

··· 1 { stdenv, fetchFromGitHub, fetchurl, pkgconfig 2 , libXinerama, libSM, libXxf86vm 3 + , gtk2, gtk3 4 , xorgproto, gst_all_1, setfile 5 , libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms 6 , withMesa ? libGLSupported, libGLU ? null, libGL ? null ··· 30 31 buildInputs = [ 32 libXinerama libSM libXxf86vm xorgproto gst_all_1.gstreamer gst_all_1.gst-plugins-base 33 + ] ++ optionals withGtk2 [ gtk2 ] 34 ++ optional (!withGtk2) gtk3 35 ++ optional withMesa libGLU 36 ++ optional withWebKit webkitgtk

+1 -7

pkgs/top-level/all-packages.nix

··· 15716 wxGTK30 = wxGTK30-gtk2; 15717 wxGTK31 = wxGTK31-gtk2; 15718 15719 - wxGTK28 = callPackage ../development/libraries/wxwidgets/2.8 { 15720 - inherit (gnome2) GConf; 15721 - }; 15722 15723 wxGTK29 = callPackage ../development/libraries/wxwidgets/2.9 { 15724 - inherit (gnome2) GConf; 15725 inherit (darwin.stubs) setfile; 15726 inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QuickTime; 15727 }; 15728 15729 wxGTK30-gtk2 = callPackage ../development/libraries/wxwidgets/3.0 { 15730 withGtk2 = true; 15731 - inherit (gnome2) GConf; 15732 inherit (darwin.stubs) setfile; 15733 inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit; 15734 }; ··· 15741 15742 wxGTK31-gtk2 = callPackage ../development/libraries/wxwidgets/3.1 { 15743 withGtk2 = true; 15744 - inherit (gnome2) GConf; 15745 inherit (darwin.stubs) setfile; 15746 inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit; 15747 }; ··· 24637 fsg = callPackage ../games/fsg { 24638 wxGTK = wxGTK28.override { 24639 unicode = false; 24640 - gst-plugins-base = null; 24641 }; 24642 }; 24643

··· 15716 wxGTK30 = wxGTK30-gtk2; 15717 wxGTK31 = wxGTK31-gtk2; 15718 15719 + wxGTK28 = callPackage ../development/libraries/wxwidgets/2.8 { }; 15720 15721 wxGTK29 = callPackage ../development/libraries/wxwidgets/2.9 { 15722 inherit (darwin.stubs) setfile; 15723 inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QuickTime; 15724 }; 15725 15726 wxGTK30-gtk2 = callPackage ../development/libraries/wxwidgets/3.0 { 15727 withGtk2 = true; 15728 inherit (darwin.stubs) setfile; 15729 inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit; 15730 }; ··· 15737 15738 wxGTK31-gtk2 = callPackage ../development/libraries/wxwidgets/3.1 { 15739 withGtk2 = true; 15740 inherit (darwin.stubs) setfile; 15741 inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit; 15742 }; ··· 24632 fsg = callPackage ../games/fsg { 24633 wxGTK = wxGTK28.override { 24634 unicode = false; 24635 }; 24636 }; 24637