public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ledger-web: do not make our own wrapper

Browse Source
This commit is contained in:
Peter Hoeg 2016-09-06 11:25:18 +08:00
parent 0b469a6725
commit c442c7172d
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/applications/office/ledger-web/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, makeWrapper, bundlerEnv, ruby { stdenv, lib, fetchFromGitHub, bundlerEnv, ruby
, withPostgresql ? true, postgresql , withPostgresql ? true, postgresql
, withSqlite ? false, sqlite , withSqlite ? false, sqlite
}: }:
@ -8,7 +8,7 @@ let
cmd = "ledger_web"; cmd = "ledger_web";
env = bundlerEnv { env = bundlerEnv {
name = _name; name = "${_name}-env";
inherit ruby; inherit ruby;
gemfile = ./Gemfile; gemfile = ./Gemfile;
lockfile = ./Gemfile.lock; lockfile = ./Gemfile.lock;
@ -25,7 +25,7 @@ in stdenv.mkDerivation rec {
name = "${_name}-${version}"; name = "${_name}-${version}";
version = "1.5.2"; version = "1.5.2";
buildInputs = [ env ruby makeWrapper ] buildInputs = [ env ruby ]
++ lib.optional withPostgresql postgresql ++ lib.optional withPostgresql postgresql
++ lib.optional withSqlite sqlite; ++ lib.optional withSqlite sqlite;
@ -39,14 +39,10 @@ in stdenv.mkDerivation rec {
dontStrip = true; dontStrip = true;
installPhase = '' 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} ln -s ${env}/bin/${cmd} $out/bin/${cmd}
wrapProgram $out/bin/${cmd} \
--set BUNDLE_BIN ${env.bundler}/bin/bundle \
--set GEM_PATH ${env}/${env.ruby.gemPath}
''; '';
} }