From b2aa977aa1f88f92392004691432c7044eab1d53 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sat, 22 Sep 2018 12:25:12 +0200 Subject: ... --- users/gkleen@odin.nix | 17 ++++++++--------- 1 file 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 @@ ListLike = pkgs.haskell.lib.overrideCabal superH.ListLike (oldAttrs: { libraryHaskellDepends = (oldAttrs.libraryHaskellDepends or []) ++ (with selfH; [semigroups]); }); - buchhaltung = pkgs.haskell.lib.overrideCabal (superH.buchhaltung.override { inherit (selfH) ListLike; }) (oldAttrs: { - buildDepends = (oldAttrs.buildDepends or []) ++ [ pkgs.makeWrapper ]; - postBuild = '' - ${oldAttrs.postBuild or ""} - wrapProgram $out/bin/buchhaltung \ - --prefix PATH : ${pkgs.lib.makeBinPath (with pkgs; [ aqbanking dbacl ])} - ''; - }); }); }; }; - inherit (pkgs.haskell.packages.ghc822) buchhaltung; + buchhaltung = pkgs.haskell.lib.overrideCabal haskell.packages.ghc822.buchhaltung (oldAttrs: { + buildDepends = (oldAttrs.buildDepends or []) ++ [ pkgs.makeWrapper ]; + postBuild = '' + ${oldAttrs.postBuild or ""} + wrapProgram $out/bin/buchhaltung \ + --prefix PATH : ${pkgs.lib.makeBinPath (with pkgs; [ aqbanking dbacl ])} + ''; + }); } // (import ../utils/nix/default.nix) pkgs (import {}); } -- cgit v1.2.3