1 files 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: {
+let
-  name = "${oldAttrs.name}-wrapper";
+  name = "${thermoprint-server.name}-wrapper";
-  buildInputs = [makeWrapper];
+in runCommand name {
-  postInstall = ''
+  paths = [ thermoprint-server ];
-    wrapProgram $out/bin/thermoprint-server \
+  buildInputs = [ makeWrapper ];
-      --set NIX_GHC ${ghcWithPackages (p: [thermoprint-server] ++ extraPackages p)}/bin/ghc
+} ''
-  '';
+  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
+''

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 @@
1	{ stdenv, makeWrapper	1	{ runCommand, makeWrapper
2	, ghcWithPackages	2	, ghcWithPackages
3	, thermoprint-server	3	, thermoprint-server
4	, extraPackages ? (p: [])	4	, extraPackages ? (p: [])
5	}:	5	}:
6		6
7	stdenv.lib.overrideDerivation thermoprint-server (oldAttrs: {	7	let
8	name = "${oldAttrs.name}-wrapper";	8	name = "${thermoprint-server.name}-wrapper";
9	buildInputs = [makeWrapper];	9	in runCommand name {
10	postInstall = ''	10	paths = [ thermoprint-server ];
11	wrapProgram $out/bin/thermoprint-server \	11	buildInputs = [ makeWrapper ];
12	--set NIX_GHC ${ghcWithPackages (p: [thermoprint-server] ++ extraPackages p)}/bin/ghc	12	} ''
13	'';	13	cp -vr ${thermoprint-server} $out
14	})	14	chmod u+w $out/bin
		15	wrapProgram $out/bin/thermoprint-server \
		16	--set NIX_GHC ${ghcWithPackages (p: [ thermoprint-server ] ++ extraPackages p)}/bin/ghc
		17	''