diff options
| author | Joachim Fasting <joachifm@fastmail.fm> | 2015-06-15 13:42:31 +0200 |
|---|---|---|
| committer | Joachim Fasting <joachifm@fastmail.fm> | 2015-11-24 14:45:15 +0100 |
| commit | 43a1582ef3655f77c13bac961b17b607fa8e6d38 (patch) | |
| tree | 2da846b65cd0f557c1167ee6df9f559bdcb7e1f9 /pkgs/applications/misc/gphoto2 | |
| parent | 241515a6b75b1618e8c1eba0a7ff48f27f7757a1 (diff) | |
| download | nixlib-43a1582ef3655f77c13bac961b17b607fa8e6d38.tar nixlib-43a1582ef3655f77c13bac961b17b607fa8e6d38.tar.gz nixlib-43a1582ef3655f77c13bac961b17b607fa8e6d38.tar.bz2 nixlib-43a1582ef3655f77c13bac961b17b607fa8e6d38.tar.lz nixlib-43a1582ef3655f77c13bac961b17b607fa8e6d38.tar.xz nixlib-43a1582ef3655f77c13bac961b17b607fa8e6d38.tar.zst nixlib-43a1582ef3655f77c13bac961b17b607fa8e6d38.zip | |
gphoto2fs: reimplement using mkDerivation
Diffstat (limited to 'pkgs/applications/misc/gphoto2')
| -rw-r--r-- | pkgs/applications/misc/gphoto2/gphotofs.nix | 33 | ||||
| -rw-r--r-- | pkgs/applications/misc/gphoto2/src-info-for-gphotofs.nix | 6 |
2 files changed, 11 insertions, 28 deletions
diff --git a/pkgs/applications/misc/gphoto2/gphotofs.nix b/pkgs/applications/misc/gphoto2/gphotofs.nix index 1e6d924b63a5..230e0ff74142 100644 --- a/pkgs/applications/misc/gphoto2/gphotofs.nix +++ b/pkgs/applications/misc/gphoto2/gphotofs.nix @@ -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 = []; - - /* doConfigure should be removed if not needed */ - phaseNames = ["doConfigure" "doMakeInstall"]; + buildInputs = [ + libgphoto2 fuse pkgconfig glib libtool + ]; - 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; }; } diff --git a/pkgs/applications/misc/gphoto2/src-info-for-gphotofs.nix b/pkgs/applications/misc/gphoto2/src-info-for-gphotofs.nix deleted file mode 100644 index 1a4cceb6279b..000000000000 --- a/pkgs/applications/misc/gphoto2/src-info-for-gphotofs.nix +++ /dev/null @@ -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"; -} |