From 94a216ad062646a509b824f23915e95271efb243 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Mon, 17 Jul 2017 17:43:20 +0200 Subject: Fix wrapper build --- server/wrapped.nix | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/server/wrapped.nix b/server/wrapped.nix index 04a483b..8fde8ac 100644 --- a/server/wrapped.nix +++ b/server/wrapped.nix @@ -1,14 +1,17 @@ -{ stdenv, makeWrapper +{ runCommand, makeWrapper , ghcWithPackages , thermoprint-server , extraPackages ? (p: []) }: -stdenv.lib.overrideDerivation thermoprint-server (oldAttrs: { - name = "${oldAttrs.name}-wrapper"; - buildInputs = [makeWrapper]; - postInstall = '' - wrapProgram $out/bin/thermoprint-server \ - --set NIX_GHC ${ghcWithPackages (p: [thermoprint-server] ++ extraPackages p)}/bin/ghc - ''; -}) +let + name = "${thermoprint-server.name}-wrapper"; +in runCommand name { + paths = [ thermoprint-server ]; + buildInputs = [ makeWrapper ]; +} '' + cp -vr ${thermoprint-server} $out + chmod u+w $out/bin + wrapProgram $out/bin/thermoprint-server \ + --set NIX_GHC ${ghcWithPackages (p: [ thermoprint-server ] ++ extraPackages p)}/bin/ghc +'' -- cgit v1.2.3