From 55a7a01e808654c8f251ce177ba4e5e7c2b0eb78 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 23 Aug 2020 22:42:58 +0200 Subject: wxGTK28: 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. --- pkgs/development/libraries/wxwidgets/2.8/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/wxwidgets/2.8/default.nix b/pkgs/development/libraries/wxwidgets/2.8/default.nix index 98cf0d58479b0..deb7d19c0de1a 100644 --- a/pkgs/development/libraries/wxwidgets/2.8/default.nix +++ b/pkgs/development/libraries/wxwidgets/2.8/default.nix @@ -1,5 +1,5 @@ { 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 ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5b0985e783931..fc051bf193dae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15563,9 +15563,7 @@ 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; @@ -24400,7 +24398,6 @@ in fsg = callPackage ../games/fsg { wxGTK = wxGTK28.override { unicode = false; - gst-plugins-base = null; }; }; -- cgit 1.4.1 From 6de7492703950160447625107428fa1471284f73 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 23 Aug 2020 22:43:21 +0200 Subject: 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. --- pkgs/development/libraries/wxwidgets/2.9/default.nix | 7 +++---- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/wxwidgets/2.9/default.nix b/pkgs/development/libraries/wxwidgets/2.9/default.nix index 3812c81a51974..5db7cfc26ba91 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 fc051bf193dae..31848f8ceb8c9 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; }; -- cgit 1.4.1 From e2d02a84d67fa405db7c9f4e140f2803a5b4bd86 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 23 Aug 2020 22:43:48 +0200 Subject: wxGTK30-gtk2: drop ancient deps GConf has been abandoned for many years and would not work without user running the daemon. --- pkgs/development/libraries/wxwidgets/3.0/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/wxwidgets/3.0/default.nix b/pkgs/development/libraries/wxwidgets/3.0/default.nix index f125ac9dca0b8..df90342a972ef 100644 --- a/pkgs/development/libraries/wxwidgets/3.0/default.nix +++ b/pkgs/development/libraries/wxwidgets/3.0/default.nix @@ -1,6 +1,6 @@ { 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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 31848f8ceb8c9..4b0ef98e51aa7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15572,7 +15572,6 @@ in 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; }; -- cgit 1.4.1 From 2fd206f78b55e6d67f29b0136a1a1d5e2d6afeed Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 23 Aug 2020 22:44:16 +0200 Subject: wxGTK31-gtk2: drop ancient deps GConf has been abandoned for many years and would not work without user running the daemon. --- pkgs/development/libraries/wxwidgets/3.1/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/wxwidgets/3.1/default.nix b/pkgs/development/libraries/wxwidgets/3.1/default.nix index 0f30deb6c5227..44e6fe49b4896 100644 --- a/pkgs/development/libraries/wxwidgets/3.1/default.nix +++ b/pkgs/development/libraries/wxwidgets/3.1/default.nix @@ -1,6 +1,6 @@ { 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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4b0ef98e51aa7..50d0673f8375d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15584,7 +15584,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; }; -- cgit 1.4.1