diff options
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/science/electronics/geda/default.nix | 28 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 9 insertions, 21 deletions
diff --git a/pkgs/applications/science/electronics/geda/default.nix b/pkgs/applications/science/electronics/geda/default.nix index 6b77f75b11b..775bae98133 100644 --- a/pkgs/applications/science/electronics/geda/default.nix +++ b/pkgs/applications/science/electronics/geda/default.nix @@ -1,32 +1,20 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkg-config, guile, gtk2, flex, gawk, perl }: +{ lib, stdenv, fetchurl, groff, pkg-config, python2, guile, gtk2, flex, gawk, perl }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "geda"; - version = "1.8.2-20130925"; + version = "1.10.2"; src = fetchurl { - url = "http://ftp.geda-project.org/geda-gaf/stable/v1.8/1.8.2/geda-gaf-1.8.2.tar.gz"; - sha256 = "08dpa506xk4gjbbi8vnxcb640wq4ihlgmhzlssl52nhvxwx7gx5v"; + url = "http://ftp.geda-project.org/geda-gaf/stable/v${lib.versions.majorMinor version}/${version}/geda-gaf-${version}.tar.gz"; + hash = "sha256-6GKrJBUoU4+jvuJzkmH1aAERArYMXjmi8DWGY8BCyKQ="; }; - patches = [ - # Pull upstream patch for -fno-common toolchains - (fetchpatch { - name = "fno-common-p1.patch"; - url = "http://git.geda-project.org/geda-gaf/patch/?id=cb6bac898fe43c5a59b577123ba8698ec04deef6"; - sha256 = "0njlh20qjrlqf5m8p92vmkl0jsm747f4mbqwvldnf8nd2j608nkq"; - }) - (fetchpatch { - name = "fno-common-p2.patch"; - url = "http://git.geda-project.org/geda-gaf/patch/?id=7b9d523a3558290b4487c3ff9a4a5b43e8941158"; - sha256 = "1z9gzz5ngsbq6c9dw2dfz7kpsq97zhs1ma9saxm7hiybwadbj18k"; - }) - ]; - configureFlags = [ "--disable-update-xdg-database" + "--without-libfam" ]; - nativeBuildInputs = [ pkg-config ]; + + nativeBuildInputs = [ groff pkg-config python2 ]; buildInputs = [ guile gtk2 flex gawk perl ]; meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 09c7cdfba27..b9a742a25a1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -39317,7 +39317,7 @@ with pkgs; fparser = callPackage ../applications/science/electronics/fparser { }; geda = callPackage ../applications/science/electronics/geda { - guile = guile_2_0; + guile = guile_2_2; }; gedit = callPackage ../applications/editors/gedit { }; |