diff options
author | Joachim F <joachifm@users.noreply.github.com> | 2016-09-06 23:42:35 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-09-06 23:42:35 +0200 |
commit | c43c0b2efac1cfbcb7e22cc6362e45dc7917c3d8 (patch) | |
tree | 9b7b1185dbf76ab300c2987f419556d7a46a7a46 /pkgs | |
parent | 5100db559a38374e537197185dc9775234b36071 (diff) | |
parent | c442c7172da26802c311e67d4e27399f7cb6dfee (diff) |
Merge pull request #18349 from peterhoeg/ledger-web2
ledger-web: do not make our own wrapper
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/office/ledger-web/default.nix | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/pkgs/applications/office/ledger-web/default.nix b/pkgs/applications/office/ledger-web/default.nix index b7ba10a730f7a..95f91351a5495 100644 --- a/pkgs/applications/office/ledger-web/default.nix +++ b/pkgs/applications/office/ledger-web/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, makeWrapper, bundlerEnv, ruby +{ stdenv, lib, fetchFromGitHub, bundlerEnv, ruby , withPostgresql ? true, postgresql , withSqlite ? false, sqlite }: @@ -8,7 +8,7 @@ let cmd = "ledger_web"; env = bundlerEnv { - name = _name; + name = "${_name}-env"; inherit ruby; gemfile = ./Gemfile; lockfile = ./Gemfile.lock; @@ -25,7 +25,7 @@ in stdenv.mkDerivation rec { name = "${_name}-${version}"; version = "1.5.2"; - buildInputs = [ env ruby makeWrapper ] + buildInputs = [ env ruby ] ++ lib.optional withPostgresql postgresql ++ lib.optional withSqlite sqlite; @@ -39,14 +39,10 @@ in stdenv.mkDerivation rec { dontStrip = true; installPhase = '' - mkdir -p $out + mkdir -p $out/bin - cp --no-preserve=mode -r bin lib $out + cp --no-preserve=mode -r lib $out - chmod 0755 $out/bin/${cmd} - - wrapProgram $out/bin/${cmd} \ - --set BUNDLE_BIN ${env.bundler}/bin/bundle \ - --set GEM_PATH ${env}/${env.ruby.gemPath} + ln -s ${env}/bin/${cmd} $out/bin/${cmd} ''; } |