Author: urkud
Date: Thu Aug 18 12:52:22 2011
New Revision: 28652
URL: https://svn.nixos.org/websvn/nix/?rev=28652&sc=1
Log:
Let cups-pdf-filter use cups.src
Modified:
nixpkgs/trunk/pkgs/misc/cups/default.nix
nixpkgs/trunk/pkgs/misc/cups/pdf-filter.nix
Modified: nixpkgs/trunk/pkgs/misc/cups/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/misc/cups/default.nix Thu Aug 18 09:07:31 2011
(r28651)
+++ nixpkgs/trunk/pkgs/misc/cups/default.nix Thu Aug 18 12:52:22 2011
(r28652)
@@ -6,6 +6,8 @@
stdenv.mkDerivation {
name = "cups-${version}";
+ passthru = { inherit version; };
+
src = fetchurl {
url =
"http://ftp.easysw.com/pub/cups/${version}/cups-${version}-source.tar.bz2";;
sha256 = "1xlnkdqldq81pdqgisqbyh92k249bzz35m1f5bp4la06p00ksvjf";
Modified: nixpkgs/trunk/pkgs/misc/cups/pdf-filter.nix
==============================================================================
--- nixpkgs/trunk/pkgs/misc/cups/pdf-filter.nix Thu Aug 18 09:07:31 2011
(r28651)
+++ nixpkgs/trunk/pkgs/misc/cups/pdf-filter.nix Thu Aug 18 12:52:22 2011
(r28652)
@@ -1,14 +1,9 @@
{ stdenv, fetchurl, pkgconfig, cups, poppler }:
-let version = "1.4.5"; in
-
stdenv.mkDerivation {
- name = "cups-pdf-filter-${version}";
+ name = "cups-pdf-filter-${cups.version}";
- src = fetchurl {
- url =
"http://ftp.easysw.com/pub/cups/${version}/cups-${version}-source.tar.bz2";;
- sha256 = "1zhf3hvx11i0qnbwyybmdhx4fxkxfd4ch69k59fj5bz8wvcdcl04";
- };
+ inherit (cups) src;
buildInputs = [ pkgconfig cups poppler ];
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
