From 43a1582ef3655f77c13bac961b17b607fa8e6d38 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Mon, 15 Jun 2015 13:42:31 +0200
Subject: [PATCH] gphoto2fs: reimplement using mkDerivation

---
 pkgs/applications/misc/gphoto2/gphotofs.nix   | 33 +++++++------------
 .../misc/gphoto2/src-info-for-gphotofs.nix    |  6 ----
 pkgs/top-level/all-packages.nix               |  2 +-
 3 files changed, 12 insertions(+), 29 deletions(-)
 delete mode 100644 pkgs/applications/misc/gphoto2/src-info-for-gphotofs.nix

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 = [];
+  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;
   };
 }
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";
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8198fd675bc5..90ef487f557d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -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 { };