diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-04-01 19:11:59 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-04-01 19:11:59 +0000 |
commit | 776554d9e1613ec7207637308e1c7c3533e4c05a (patch) | |
tree | 85bf84e70a2ed7a36a9a6b7482e1e023a24520b3 /pkgs/applications/graphics | |
parent | 7bf54b734e6faf87abc117db482a641fcb06b9b7 (diff) |
* Fixed and/or updated some more components. The number of explicit
builders is dropping steadily.
svn path=/nixpkgs/trunk/; revision=900
Diffstat (limited to 'pkgs/applications/graphics')
-rw-r--r-- | pkgs/applications/graphics/gqview/builder.sh | 8 | ||||
-rw-r--r-- | pkgs/applications/graphics/gqview/default.nix | 13 |
2 files changed, 5 insertions, 16 deletions
diff --git a/pkgs/applications/graphics/gqview/builder.sh b/pkgs/applications/graphics/gqview/builder.sh deleted file mode 100644 index 808ab924e620..000000000000 --- a/pkgs/applications/graphics/gqview/builder.sh +++ /dev/null @@ -1,8 +0,0 @@ -buildinputs="$pkgconfig $gtk $libpng" -. $stdenv/setup || exit 1 - -tar xvfz $src || exit 1 -cd gqview-* || exit 1 -./configure --prefix=$out || exit 1 -make || exit 1 -make install || exit 1 diff --git a/pkgs/applications/graphics/gqview/default.nix b/pkgs/applications/graphics/gqview/default.nix index 32352619a385..57dcb70ec970 100644 --- a/pkgs/applications/graphics/gqview/default.nix +++ b/pkgs/applications/graphics/gqview/default.nix @@ -3,18 +3,15 @@ assert pkgconfig != null && gtk != null && libpng != null; # Note that we cannot just copy gtk's png attribute, since gtk might # not be linked against png. -assert libpng == gtk.libpng; +# !!! assert libpng == gtk.libpng; stdenv.mkDerivation { - name = "gqview-1.3.5"; + name = "gqview-1.4.1"; - builder = ./builder.sh; src = fetchurl { - url = http://heanet.dl.sourceforge.net/sourceforge/gqview/gqview-1.3.5.tar.gz; - md5 = "c44687bdd636ea6e5133fb936abf880a"; + url = http://heanet.dl.sourceforge.net/sourceforge/gqview/gqview-1.4.1.tar.gz; + md5 = "d963fbb878d78e8ebf78ea8c18caa72f"; }; - pkgconfig = pkgconfig; - gtk = gtk; - libpng = libpng; + buildInputs = [pkgconfig gtk libpng]; } |