summary refs log tree commit diff
diff options
context:
space:
mode:
authorzimbatm <zimbatm@zimbatm.com>2016-07-03 18:10:33 +0100
committerGitHub <noreply@github.com>2016-07-03 18:10:33 +0100
commit17d6abb771299dde0d0a84528be30d5f32af70bc (patch)
treed8e1001f1d4d6d6ea13e964461ced765bd0d55dd
parent8346e72a222025e500262eecca62d38e2dd3243a (diff)
parenta11f7802746c2ce442a8eae907292195507575f1 (diff)
downloadnixlib-17d6abb771299dde0d0a84528be30d5f32af70bc.tar
nixlib-17d6abb771299dde0d0a84528be30d5f32af70bc.tar.gz
nixlib-17d6abb771299dde0d0a84528be30d5f32af70bc.tar.bz2
nixlib-17d6abb771299dde0d0a84528be30d5f32af70bc.tar.lz
nixlib-17d6abb771299dde0d0a84528be30d5f32af70bc.tar.xz
nixlib-17d6abb771299dde0d0a84528be30d5f32af70bc.tar.zst
nixlib-17d6abb771299dde0d0a84528be30d5f32af70bc.zip
Merge pull request #16676 from mpscholten/maphosts2
maphosts: Don't provide bundler anymore
-rw-r--r--pkgs/tools/networking/maphosts/default.nix22
1 files changed, 16 insertions, 6 deletions
diff --git a/pkgs/tools/networking/maphosts/default.nix b/pkgs/tools/networking/maphosts/default.nix
index 7e722fee4002..08c56574dcf7 100644
--- a/pkgs/tools/networking/maphosts/default.nix
+++ b/pkgs/tools/networking/maphosts/default.nix
@@ -1,12 +1,22 @@
 { stdenv, lib, bundlerEnv, ruby }:
 
-bundlerEnv {
-  name = "maphosts-1.1.1";
+stdenv.mkDerivation rec {
+  name = "maphosts-${env.gems.maphosts.version}";
 
-  inherit ruby;
-  gemfile = ./Gemfile;
-  lockfile = ./Gemfile.lock;
-  gemset = ./gemset.nix;
+  env = bundlerEnv {
+    name = "maphosts-gems";
+    inherit ruby;
+    gemfile = ./Gemfile;
+    lockfile = ./Gemfile.lock;
+    gemset = ./gemset.nix;
+  };
+
+  phases = ["installPhase"];
+
+  installPhase = ''
+    mkdir -p "$out/bin"
+    ln -s "${env}/bin/maphosts" "$out/bin/maphosts"
+  '';
 
   meta = with lib; {
     description = "Small command line application for keeping your project hostnames in sync with /etc/hosts";