summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2018-09-22 12:25:12 +0200
committerGregor Kleen <gkleen@yggdrasil.li>2018-09-22 12:25:12 +0200
commitb2aa977aa1f88f92392004691432c7044eab1d53 (patch)
tree5d7d6d07f4987be321aaaf031c84dba5a6c59b44
parent76b45f63a0b7c9e83de06fddefc96475dd7ca288 (diff)
downloadnixos-b2aa977aa1f88f92392004691432c7044eab1d53.tar
nixos-b2aa977aa1f88f92392004691432c7044eab1d53.tar.gz
nixos-b2aa977aa1f88f92392004691432c7044eab1d53.tar.bz2
nixos-b2aa977aa1f88f92392004691432c7044eab1d53.tar.xz
nixos-b2aa977aa1f88f92392004691432c7044eab1d53.zip
...
-rw-r--r--users/gkleen@odin.nix17
1 files changed, 8 insertions, 9 deletions
diff --git a/users/gkleen@odin.nix b/users/gkleen@odin.nix
index 2c8c461e..5ebd30dd 100644
--- a/users/gkleen@odin.nix
+++ b/users/gkleen@odin.nix
@@ -16,18 +16,17 @@
16 ListLike = pkgs.haskell.lib.overrideCabal superH.ListLike (oldAttrs: { 16 ListLike = pkgs.haskell.lib.overrideCabal superH.ListLike (oldAttrs: {
17 libraryHaskellDepends = (oldAttrs.libraryHaskellDepends or []) ++ (with selfH; [semigroups]); 17 libraryHaskellDepends = (oldAttrs.libraryHaskellDepends or []) ++ (with selfH; [semigroups]);
18 }); 18 });
19 buchhaltung = pkgs.haskell.lib.overrideCabal (superH.buchhaltung.override { inherit (selfH) ListLike; }) (oldAttrs: {
20 buildDepends = (oldAttrs.buildDepends or []) ++ [ pkgs.makeWrapper ];
21 postBuild = ''
22 ${oldAttrs.postBuild or ""}
23 wrapProgram $out/bin/buchhaltung \
24 --prefix PATH : ${pkgs.lib.makeBinPath (with pkgs; [ aqbanking dbacl ])}
25 '';
26 });
27 }); 19 });
28 }; 20 };
29 }; 21 };
30 22
31 inherit (pkgs.haskell.packages.ghc822) buchhaltung; 23 buchhaltung = pkgs.haskell.lib.overrideCabal haskell.packages.ghc822.buchhaltung (oldAttrs: {
24 buildDepends = (oldAttrs.buildDepends or []) ++ [ pkgs.makeWrapper ];
25 postBuild = ''
26 ${oldAttrs.postBuild or ""}
27 wrapProgram $out/bin/buchhaltung \
28 --prefix PATH : ${pkgs.lib.makeBinPath (with pkgs; [ aqbanking dbacl ])}
29 '';
30 });
32 } // (import ../utils/nix/default.nix) pkgs (import <nixpkgs> {}); 31 } // (import ../utils/nix/default.nix) pkgs (import <nixpkgs> {});
33} 32}