about summary refs log tree commit diff
diff options
context:
space:
mode:
authorLinus Heckemann <git@sphalerite.org>2017-04-30 13:33:58 +0100
committerJörg Thalheim <joerg@thalheim.io>2017-05-09 16:34:21 +0100
commit11272e930f751e726e46ca1c9c84a82f2fc33b78 (patch)
tree320125b70f2fdeb0c0dead7dea7e3141c8633b56
parentc3bbc8adea6843edb3b71a6ff18ed544b3d22de4 (diff)
downloadnixlib-11272e930f751e726e46ca1c9c84a82f2fc33b78.tar
nixlib-11272e930f751e726e46ca1c9c84a82f2fc33b78.tar.gz
nixlib-11272e930f751e726e46ca1c9c84a82f2fc33b78.tar.bz2
nixlib-11272e930f751e726e46ca1c9c84a82f2fc33b78.tar.lz
nixlib-11272e930f751e726e46ca1c9c84a82f2fc33b78.tar.xz
nixlib-11272e930f751e726e46ca1c9c84a82f2fc33b78.tar.zst
nixlib-11272e930f751e726e46ca1c9c84a82f2fc33b78.zip
camlistore: use buildGoPackage
this removes go references from the package

fixes #25346
-rw-r--r--pkgs/applications/misc/camlistore/default.nix20
1 files changed, 11 insertions, 9 deletions
diff --git a/pkgs/applications/misc/camlistore/default.nix b/pkgs/applications/misc/camlistore/default.nix
index 23bd89b4f057..d90e8a6dba66 100644
--- a/pkgs/applications/misc/camlistore/default.nix
+++ b/pkgs/applications/misc/camlistore/default.nix
@@ -1,26 +1,28 @@
-{ stdenv, lib, go, fetchgit, git }:
+{ stdenv, lib, go, fetchgit, git, buildGoPackage }:
 
-stdenv.mkDerivation rec {
-  version = "0.9";
+buildGoPackage rec {
   name = "camlistore-${version}";
+  version = "0.9";
 
   src = fetchgit {
     url = "https://github.com/camlistore/camlistore";
-    rev = "7b78c50007780643798adf3fee4c84f3a10154c9";
-    sha256 = "1vc4ca2rn8da0z0viv3vv2p8z211zdvq83jh2x2izdckdz204n17";
+    rev = "refs/tags/${version}";
+    sha256 = "1ypplr939ny9drsdngapa029fgak0wic8sbna588m79cbl17psya";
     leaveDotGit = true;
   };
 
-  buildInputs = [ go git ];
+  buildInputs = [ git ];
 
+  goPackagePath = "";
   buildPhase = ''
+    cd go/src/camlistore
     go run make.go
-    rm bin/README
   '';
 
   installPhase = ''
-    mkdir -p $out/bin
-    cp bin/* $out/bin
+    mkdir -p $bin/bin
+    rm bin/README
+    cp bin/* $bin/bin
   '';
 
   meta = with stdenv.lib; {