From 3231a6e6f074dbac7b57a3761052b48d4445f0b1 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Tue, 11 Sep 2018 10:15:24 +0200 Subject: ... --- users/gkleen@odin.nix | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/users/gkleen@odin.nix b/users/gkleen@odin.nix index ac7d823c..a75b5715 100644 --- a/users/gkleen@odin.nix +++ b/users/gkleen@odin.nix @@ -9,19 +9,13 @@ sha256 = "02a4py7zx9ib49kijpjckya1pb8xlb3gmp7s1dybsdjmwqbdyzx7"; }; }); - haskell = pkgs.haskell // { - packages = pkgs.haskell.packages // { - ghc822 = pkgs.haskell.packages.ghc822.extend (superH: selfH: { - buchhaltung = pkgs.haskell.lib.overrideCabal superH.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 ])} - ''; - }); - }); - }; - }; + buchhaltung = pkgs.haskell.lib.overrideCabal pkgs.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