File tree Expand file tree Collapse file tree 2 files changed +16
-1
lines changed Expand file tree Collapse file tree 2 files changed +16
-1
lines changed Original file line number Diff line number Diff line change
1
+ diff --git a/Cabal/src/Distribution/Simple/PreProcess.hs b/Cabal/src/Distribution/Simple/PreProcess.hs
2
+ index d47dd8035..da158a5a3 100644
3
+ --- a/src/Distribution/Simple/PreProcess.hs
4
+ +++ b/src/Distribution/Simple/PreProcess.hs
5
+ @@ -464,7 +464,7 @@ ppHsc2hs bi lbi clbi =
6
+ -- Returns a list of command line arguments that can either be passed
7
+ -- directly, or via a response file.
8
+ genPureArgs :: Version -> ConfiguredProgram -> String -> String -> [String]
9
+ - genPureArgs hsc2hsVersion gccProg inFile outFile =
10
+ + genPureArgs hsc2hsVersion gccProg inFile outFile = ordNub $
11
+ -- Additional gcc options
12
+ [ "--cflag=" ++ opt | opt <- programDefaultArgs gccProg
13
+ ++ programOverrideArgs gccProg ]
Original file line number Diff line number Diff line change 56
56
57
57
cabal-install = hsPkgs . callCabal2nix "cabal-install" "${ inputs . cabal } /cabal-install" { inherit ( final ) Cabal cabal-install-solver hackage-security ; } ;
58
58
cabal-install-solver = hsPkgs . callCabal2nix "cabal-install-solver" "${ inputs . cabal } /cabal-install-solver" { inherit ( final ) Cabal ; } ;
59
- Cabal = hsPkgs . callCabal2nix "Cabal" "${ inputs . cabal } /Cabal" { inherit ( final ) Cabal-syntax ; } ;
59
+ Cabal = ( hsPkgs . callCabal2nix "Cabal" "${ inputs . cabal } /Cabal" { inherit ( final ) Cabal-syntax ; } ) . overrideAttrs ( old : {
60
+ patches = ( old . patches or [ ] ) ++ [ ./cabal-hsc2hs-args-patch.diff ] ;
61
+ } ) ;
60
62
Cabal-syntax = hsPkgs . callCabal2nix "Cabal-syntax" "${ inputs . cabal } /Cabal-syntax" { } ;
61
63
Cabal-described = hsPkgs . callCabal2nix "Cabal-described" "${ inputs . cabal } /Cabal-described" { } ;
62
64
Cabal-QuickCheck = hsPkgs . callCabal2nix "Cabal-QuickCheck" "${ inputs . cabal } /Cabal-QuickCheck" { } ;
You can’t perform that action at this time.
0 commit comments