diff options
author | Nikolay Amiantov <ab@fmap.me> | 2015-03-08 18:36:37 +0300 |
---|---|---|
committer | Nikolay Amiantov <ab@fmap.me> | 2015-03-08 18:38:04 +0300 |
commit | 9545c0b80e74fc98e91d3dec6defac0c3a93fa6b (patch) | |
tree | 699727ce9dd96c73a88d940bc4453739d585d05c /pkgs/applications/window-managers/xmonad/wrapper.nix | |
parent | 3d0a6819dace56df1ad0a48c372ffc25d335e68d (diff) |
xmonad: cleanup wrapper
Diffstat (limited to 'pkgs/applications/window-managers/xmonad/wrapper.nix')
-rw-r--r-- | pkgs/applications/window-managers/xmonad/wrapper.nix | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/pkgs/applications/window-managers/xmonad/wrapper.nix b/pkgs/applications/window-managers/xmonad/wrapper.nix index cddaeb5f799f..cb02a214d5bb 100644 --- a/pkgs/applications/window-managers/xmonad/wrapper.nix +++ b/pkgs/applications/window-managers/xmonad/wrapper.nix @@ -1,22 +1,16 @@ -{ stdenv, buildEnv, ghcWithPackages, xmessage, makeWrapper, packages }: +{ stdenv, ghcWithPackages, xmessage, makeWrapper, packages }: let xmonadEnv = ghcWithPackages (self: [ self.xmonad ] ++ packages self); -drv = buildEnv { +in stdenv.mkDerivation { name = "xmonad-with-packages"; - paths = [ xmonadEnv ]; + nativeBuildInputs = [ makeWrapper ]; - postBuild = '' - # TODO: This could be avoided if buildEnv could be forced to create all directories - rm $out/bin - mkdir $out/bin - for i in ${xmonadEnv}/bin/*; do - ln -s $i $out/bin - done - wrapProgram $out/bin/xmonad \ - --set XMONAD_GHC "${xmonadEnv}/bin/ghc" \ + buildCommand = '' + mkdir -p $out/bin + makeWrapper ${xmonadEnv}/bin/xmonad $out/bin/xmonad \ + --set NIX_GHC "${xmonadEnv}/bin/ghc" \ --set XMONAD_XMESSAGE "${xmessage}/bin/xmessage" ''; - }; -in stdenv.lib.overrideDerivation drv (x : { buildInputs = x.buildInputs ++ [ makeWrapper ]; }) +} |