diff options
| author | Benno Fünfstück <benno.fuenfstueck@gmail.com> | 2015-05-10 19:02:30 +0200 |
|---|---|---|
| committer | Benno Fünfstück <benno.fuenfstueck@gmail.com> | 2015-05-10 19:02:30 +0200 |
| commit | 2818017347433bd222a6a65003bdafc5a940e393 (patch) | |
| tree | 57409d7da014a587d9de385a3cde24ca4bb5d51c /pkgs | |
| parent | 87b4f9286dd140e33b53a278f54a4ec94b856d10 (diff) | |
| parent | d8b93eb1cde070cf740fe3c6150c3acfdd259fe8 (diff) | |
| download | nixpkgs-2818017347433bd222a6a65003bdafc5a940e393.tar nixpkgs-2818017347433bd222a6a65003bdafc5a940e393.tar.gz nixpkgs-2818017347433bd222a6a65003bdafc5a940e393.tar.bz2 nixpkgs-2818017347433bd222a6a65003bdafc5a940e393.tar.lz nixpkgs-2818017347433bd222a6a65003bdafc5a940e393.tar.xz nixpkgs-2818017347433bd222a6a65003bdafc5a940e393.tar.zst nixpkgs-2818017347433bd222a6a65003bdafc5a940e393.zip | |
Merge pull request #7791 from vandenoever/elm
Fix compilation of language-glsl.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index 65281a758b8..a05f70e5d44 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -55,6 +55,11 @@ self: super: { sha256 = "193i1xmq6z0jalwmq0mhqk1khz6zz0i1hs6lgfd7ybd6qyaqnf5f"; }); + language-glsl = appendPatch super.language-glsl (pkgs.fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/noteed/language-glsl/pull/10.patch"; + sha256 = "1d8dmfqw9y7v7dlszb7l3wp0vj77j950z2r3r0ar9mcvyrmfm4in"; + }); + # haddock: No input file(s). nats = dontHaddock super.nats; bytestring-builder = dontHaddock super.bytestring-builder; |