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

drgeo: reimplement using mkDerivation

Browse Source
This commit is contained in:
Joachim Fasting 2015-06-19 14:20:05 +02:00
parent ddb9c3b701
commit 42fc03411f
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkgs/applications/science/geometry/drgeo/default.nix
View File

@ -1,24 +1,23 @@
args @ { libxml2, perl, intltool, libtool, pkgconfig, gtk, ... } : with args; { stdenv, fetchurl, libglade, gtk, guile, libxml2, perl
let version = lib.attrByPath ["version"] "1.1.0" args; in , intltool, libtool, pkgconfig }:
rec {
stdenv.mkDerivation rec {
name = "drgeo-${version}";
version = "1.1.0";
src = fetchurl { src = fetchurl {
url = mirror://sourceforge/ofset/drgeo-1.1.0.tar.gz; url = "mirror://sourceforge/ofset/${name}.tar.gz";
sha256 = "05i2czgzhpzi80xxghinvkyqx4ym0gm9f38fz53idjhigiivp4wc"; sha256 = "05i2czgzhpzi80xxghinvkyqx4ym0gm9f38fz53idjhigiivp4wc";
}; };
patches = [ ./struct.patch ];
buildInputs = [libglade gtk guile libxml2 buildInputs = [libglade gtk guile libxml2
perl intltool libtool pkgconfig]; perl intltool libtool pkgconfig];
configureFlags = [];
/* doConfigure should be specified separately */ prebuild = ''
phaseNames = ["doPatch" "doConfigure" "doPreBuild" "doMakeInstall"];
patches = [ ./struct.patch ];
doPreBuild = fullDepEntry (''
cp drgeo.desktop.in drgeo.desktop cp drgeo.desktop.in drgeo.desktop
'') ["minInit" "doUnpack"]; '';
name = "drgeo-" + version;
meta = { meta = {
description = "Interactive geometry program"; description = "Interactive geometry program";
}; };

2
pkgs/top-level/all-packages.nix
View File

@ -14610,7 +14610,7 @@ let
### SCIENCE/GEOMETRY ### SCIENCE/GEOMETRY
drgeo = builderDefsPackage (callPackage ../applications/science/geometry/drgeo) { drgeo = callPackage ../applications/science/geometry/drgeo {
inherit (gnome) libglade; inherit (gnome) libglade;
guile = guile_1_8; guile = guile_1_8;
}; };