diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2020-08-23 22:43:21 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2020-08-27 20:32:38 +0200 |
| commit | 6de7492703950160447625107428fa1471284f73 (patch) | |
| tree | 9d67f85161ef0fc6148e08494cd2ecc7fe2e3b97 | |
| parent | 55a7a01e808654c8f251ce177ba4e5e7c2b0eb78 (diff) | |
| download | nixpkgs-6de7492703950160447625107428fa1471284f73.tar nixpkgs-6de7492703950160447625107428fa1471284f73.tar.gz nixpkgs-6de7492703950160447625107428fa1471284f73.tar.bz2 nixpkgs-6de7492703950160447625107428fa1471284f73.tar.lz nixpkgs-6de7492703950160447625107428fa1471284f73.tar.xz nixpkgs-6de7492703950160447625107428fa1471284f73.tar.zst nixpkgs-6de7492703950160447625107428fa1471284f73.zip | |
wxGTK29: drop ancient deps
The many-years abandoned GStreamer 0.10 branch no longer builds so let's remove it. Hopefully nothing used it these days. GConf has been abandoned for years too and would not work without user running the daemon.
| -rw-r--r-- | pkgs/development/libraries/wxwidgets/2.9/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/development/libraries/wxwidgets/2.9/default.nix b/pkgs/development/libraries/wxwidgets/2.9/default.nix index 3812c81a519..5db7cfc26ba 100644 --- a/pkgs/development/libraries/wxwidgets/2.9/default.nix +++ b/pkgs/development/libraries/wxwidgets/2.9/default.nix @@ -1,5 +1,5 @@ { 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" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fc051bf193d..31848f8ceb8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15566,7 +15566,6 @@ in 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; }; |