Merge pull request #296812 from aaronjheng/gwyddion
gwyddion: remove broken python support
This commit is contained in:
commit
87c7aabf97
|
@ -1,5 +1,4 @@
|
||||||
{ lib, stdenv, fetchurl, gtk2, pkg-config, fftw, file,
|
{ lib, stdenv, fetchurl, gtk2, pkg-config, fftw, file,
|
||||||
pythonSupport ? false, python2Packages,
|
|
||||||
gnome2,
|
gnome2,
|
||||||
openexrSupport ? true, openexr,
|
openexrSupport ? true, openexr,
|
||||||
libzipSupport ? true, libzip,
|
libzipSupport ? true, libzip,
|
||||||
|
@ -15,10 +14,6 @@
|
||||||
openglSupport ? !stdenv.isDarwin, libGL
|
openglSupport ? !stdenv.isDarwin, libGL
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
|
||||||
inherit (python2Packages) pygtk pygobject2 python;
|
|
||||||
in
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "gwyddion";
|
pname = "gwyddion";
|
||||||
version = "2.65";
|
version = "2.65";
|
||||||
|
@ -43,9 +38,6 @@ stdenv.mkDerivation rec {
|
||||||
optional libuniqueSupport libunique ++
|
optional libuniqueSupport libunique ++
|
||||||
optional libzipSupport libzip;
|
optional libzipSupport libzip;
|
||||||
|
|
||||||
propagatedBuildInputs = with lib;
|
|
||||||
optionals pythonSupport [ pygtk pygobject2 python gnome2.gtksourceview ];
|
|
||||||
|
|
||||||
# This patch corrects problems with python support, but should apply cleanly
|
# This patch corrects problems with python support, but should apply cleanly
|
||||||
# regardless of whether python support is enabled, and have no effects if
|
# regardless of whether python support is enabled, and have no effects if
|
||||||
# it is disabled.
|
# it is disabled.
|
||||||
|
|
Loading…
Reference in New Issue
Block a user