diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2019-08-27 19:53:01 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-27 19:53:01 -0400 |
| commit | 2b17b326417f64b2fa30f33d4cccc48645bf9290 (patch) | |
| tree | 4de4c5876c3a89e41fb357e68c13f2b68ec29f3c /pkgs | |
| parent | 3d321db0f25c6419357441398a64cdcbe9371244 (diff) | |
| parent | d15019d43919e1aa31b0d1b4e51183cc2960a403 (diff) | |
| download | nixlib-2b17b326417f64b2fa30f33d4cccc48645bf9290.tar nixlib-2b17b326417f64b2fa30f33d4cccc48645bf9290.tar.gz nixlib-2b17b326417f64b2fa30f33d4cccc48645bf9290.tar.bz2 nixlib-2b17b326417f64b2fa30f33d4cccc48645bf9290.tar.lz nixlib-2b17b326417f64b2fa30f33d4cccc48645bf9290.tar.xz nixlib-2b17b326417f64b2fa30f33d4cccc48645bf9290.tar.zst nixlib-2b17b326417f64b2fa30f33d4cccc48645bf9290.zip | |
Merge pull request #67589 from Ma27/libglade-without-python2
gnome2.libglade: make python2 build optional
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/desktops/gnome-2/platform/libglade/default.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/desktops/gnome-2/platform/libglade/default.nix b/pkgs/desktops/gnome-2/platform/libglade/default.nix index c61ecc16f154..d51cccf79066 100644 --- a/pkgs/desktops/gnome-2/platform/libglade/default.nix +++ b/pkgs/desktops/gnome-2/platform/libglade/default.nix @@ -1,4 +1,6 @@ -{stdenv, fetchurl, pkgconfig, gtk2, libxml2, python, gettext}: +{ stdenv, fetchurl, pkgconfig, gtk2, libxml2, python2 ? null, withLibgladeConvert ? false, gettext }: + +assert withLibgladeConvert -> python2 != null; stdenv.mkDerivation { name = "libglade-2.6.4"; @@ -11,7 +13,8 @@ stdenv.mkDerivation { outputs = [ "out" "dev" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk2 python gettext ]; + buildInputs = [ gtk2 gettext ] + ++ stdenv.lib.optional withLibgladeConvert python2; NIX_LDFLAGS = "-lgmodule-2.0"; |