gphoto2fs: reimplement using mkDerivation

This commit is contained in:
Joachim Fasting 2015-06-15 13:42:31 +02:00
parent 241515a6b7
commit 43a1582ef3
3 changed files with 12 additions and 29 deletions

View File

@ -1,33 +1,22 @@
a @ { libgphoto2, fuse, pkgconfig, glib, libtool, ... } : { stdenv, fetchurl, libtool, pkgconfig, libgphoto2, fuse, glib }:
let
fetchurl = a.fetchurl;
s = import ./src-info-for-gphotofs.nix;
version = a.lib.attrByPath ["version"] s.version a; stdenv.mkDerivation rec {
buildInputs = with a; [ name = "gphoto2fs-${version}";
libgphoto2 fuse pkgconfig glib libtool version = "0.5.0";
];
in
rec {
src = fetchurl { src = fetchurl {
url = s.url; url="mirror://sourceforge/gphoto/gphotofs/${version}/gphotofs-0.5.tar.bz2";
sha256 = s.hash; sha256 = "1k23ncbsbh64r7kz050bg31jqamchyswgg9izhzij758d7gc8vk7";
}; };
inherit buildInputs; buildInputs = [
configureFlags = []; libgphoto2 fuse pkgconfig glib libtool
];
/* doConfigure should be removed if not needed */
phaseNames = ["doConfigure" "doMakeInstall"];
name = "gphoto2fs-" + version;
meta = { meta = {
description = "Fuse FS to mount a digital camera"; description = "Fuse FS to mount a digital camera";
maintainers = [ maintainers = [
a.lib.maintainers.raskin stdenv.lib.maintainers.raskin
];
platforms = [
"i686-linux" "x86_64-linux"
]; ];
platforms = stdenv.lib.platforms.linux;
}; };
} }

View File

@ -1,6 +0,0 @@
rec {
advertisedUrl="mirror://sourceforge/gphoto/gphotofs/0.5.0/gphotofs-0.5.tar.bz2";
version = "0.5.0";
url="mirror://sourceforge/gphoto/gphotofs/0.5.0/gphotofs-0.5.tar.bz2";
hash = "1k23ncbsbh64r7kz050bg31jqamchyswgg9izhzij758d7gc8vk7";
}

View File

@ -11882,7 +11882,7 @@ let
gphoto2 = callPackage ../applications/misc/gphoto2 { }; gphoto2 = callPackage ../applications/misc/gphoto2 { };
gphoto2fs = builderDefsPackage (callPackage ../applications/misc/gphoto2/gphotofs.nix) {}; gphoto2fs = callPackage ../applications/misc/gphoto2/gphotofs.nix { };
gramps = callPackage ../applications/misc/gramps { }; gramps = callPackage ../applications/misc/gramps { };