diff options
| author | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2022-02-21 23:30:03 +0100 |
|---|---|---|
| committer | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2022-02-21 23:48:42 +0100 |
| commit | 368ad4df2ea6900656287072d32fe9f0d22d9ec5 (patch) | |
| tree | f2128dc2b28152836036871009e154b55f4febcb /pkgs/development/libraries/wxwidgets | |
| parent | ee2f1269d0734cafb182dc90e2848e138855e698 (diff) | |
wxwidgets: resolve easy let ins
Diffstat (limited to 'pkgs/development/libraries/wxwidgets')
| -rw-r--r-- | pkgs/development/libraries/wxwidgets/wxGTK30.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/libraries/wxwidgets/wxGTK31.nix | 8 |
2 files changed, 5 insertions, 8 deletions
diff --git a/pkgs/development/libraries/wxwidgets/wxGTK30.nix b/pkgs/development/libraries/wxwidgets/wxGTK30.nix index 9395dd7eb362..7fad497c9cec 100644 --- a/pkgs/development/libraries/wxwidgets/wxGTK30.nix +++ b/pkgs/development/libraries/wxwidgets/wxGTK30.nix @@ -28,7 +28,6 @@ assert withGtk2 -> (!withWebKit); let - inherit (gst_all_1) gstreamer gst-plugins-base; gtk = if withGtk2 then gtk2 else gtk3; in stdenv.mkDerivation rec { @@ -47,8 +46,8 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gstreamer - gst-plugins-base + gst_all_1.gstreamer + gst_all_1.gst-plugins-base gtk libSM libXinerama diff --git a/pkgs/development/libraries/wxwidgets/wxGTK31.nix b/pkgs/development/libraries/wxwidgets/wxGTK31.nix index b0d3b4184702..181869075a2e 100644 --- a/pkgs/development/libraries/wxwidgets/wxGTK31.nix +++ b/pkgs/development/libraries/wxwidgets/wxGTK31.nix @@ -31,8 +31,6 @@ assert withGtk2 -> (!withWebKit); let - inherit (gnome2) GConf; - inherit (gst_all_1) gst-plugins-base gstreamer; gtk = if withGtk2 then gtk2 else gtk3; in stdenv.mkDerivation rec { @@ -55,8 +53,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - gst-plugins-base - gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gstreamer gtk libSM libXinerama @@ -65,7 +63,7 @@ stdenv.mkDerivation rec { xorgproto ] ++ lib.optionals withGtk2 [ - GConf + gnome2.GConf ] ++ lib.optional withMesa libGLU ++ lib.optional withWebKit webkitgtk |