public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk
2019-08-31 09:50:38 +02:00
parent 98640fd482 81760f3235
commit fc74ba8291
364 changed files with 8989 additions and 6877 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/desktops/gnome-2/platform/libglade/default.nix
+5 -2
View File
@@ -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";