nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-17 03:03:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

wxwidgets: resolve easy let ins

Browse Source
This commit is contained in:
Sandro Jäckel 2022-02-21 23:30:03 +01:00
parent ee2f1269d0
commit 368ad4df2e
No known key found for this signature in database
GPG Key ID: 3AF5A43A3EECC2E5
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/libraries/wxwidgets/wxGTK30.nix
View File

@ -28,7 +28,6 @@
assert withGtk2 -> (!withWebKit); assert withGtk2 -> (!withWebKit);
let let
inherit (gst_all_1) gstreamer gst-plugins-base;
gtk = if withGtk2 then gtk2 else gtk3; gtk = if withGtk2 then gtk2 else gtk3;
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -47,8 +46,8 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
gstreamer gst_all_1.gstreamer
gst-plugins-base gst_all_1.gst-plugins-base
gtk gtk
libSM libSM
libXinerama libXinerama

8
pkgs/development/libraries/wxwidgets/wxGTK31.nix
View File

@ -31,8 +31,6 @@
assert withGtk2 -> (!withWebKit); assert withGtk2 -> (!withWebKit);
let let
inherit (gnome2) GConf;
inherit (gst_all_1) gst-plugins-base gstreamer;
gtk = if withGtk2 then gtk2 else gtk3; gtk = if withGtk2 then gtk2 else gtk3;
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -55,8 +53,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ buildInputs = [
gst-plugins-base gst_all_1.gst-plugins-base
gstreamer gst_all_1.gstreamer
gtk gtk
libSM libSM
libXinerama libXinerama
@ -65,7 +63,7 @@ stdenv.mkDerivation rec {
xorgproto xorgproto
] ]
++ lib.optionals withGtk2 [ ++ lib.optionals withGtk2 [
GConf gnome2.GConf
] ]
++ lib.optional withMesa libGLU ++ lib.optional withMesa libGLU
++ lib.optional withWebKit webkitgtk ++ lib.optional withWebKit webkitgtk

2
pkgs/top-level/all-packages.nix
View File

@ -20523,7 +20523,7 @@ with pkgs;
}; };
wxmac = callPackage ../development/libraries/wxwidgets/wxmac30.nix { wxmac = callPackage ../development/libraries/wxwidgets/wxmac30.nix {
inherit (darwin.stubs) derez rez setfile; inherit (darwin.stubs) derez rez setfile;
inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel WebKit; inherit (darwin.apple_sdk.frameworks) AGL Cocoa Kernel WebKit;
}; };
wxGTK30-gtk2 = wxGTK30.override { withGtk2 = true; }; wxGTK30-gtk2 = wxGTK30.override { withGtk2 = true; };