diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-31 09:50:38 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-31 09:50:38 +0200 |
commit | fc74ba8291a8a93cba428de6bc2e7c8c7f9330f4 (patch) | |
tree | 982675c7719f2060a550e80747dfa49c1a9d6b06 /pkgs/desktops/gnome-2 | |
parent | 98640fd48212f8e6552517f667bba1901f5936d4 (diff) | |
parent | 81760f32353fa7f309a49fda17d90f43ac1e9a42 (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/desktops/gnome-2')
-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"; |