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

gphoto2fs: reimplement using mkDerivation

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
pkgs/applications/misc/gphoto2/gphotofs.nix
View File

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

6
pkgs/applications/misc/gphoto2/src-info-for-gphotofs.nix
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";
}

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

@ -11882,7 +11882,7 @@ let
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 { };