Merge pull request #46710 from jerith666/elm-glsl-fix

Elm: widen language-glsl dependency, pick up minor updates
This commit is contained in:
xeji 2018-09-16 13:01:50 +02:00 committed by GitHub
commit 0e33c56662
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 3 deletions

View file

@ -1,4 +1,6 @@
{ lib, stdenv, buildEnv, haskell, nodejs, fetchurl, makeWrapper, git }:
{ lib, stdenv, buildEnv
, haskell, nodejs
, fetchurl, fetchpatch, makeWrapper, git }:
# To update:
@ -90,6 +92,12 @@ let
export ELM_HOME=`pwd`/.elm
'' + (makeDotElm "0.19.0" (import ./packages/elm-elm.nix));
buildTools = drv.buildTools or [] ++ [ makeWrapper ];
patches = [
(fetchpatch {
url = "https://github.com/elm/compiler/pull/1784/commits/78d2d8eab310552b1b877a3e90e1e57e7a09ddec.patch";
sha256 = "0vdhk16xqm2hxw12s1b91a0bmi8w4wsxc086qlzglgnjxrl5b3w4";
})
];
postInstall = ''
wrapProgram $out/bin/elm \
--prefix PATH ':' ${lib.makeBinPath [ nodejs ]}

View file

@ -11,8 +11,8 @@ mkDerivation {
version = "0.19.0";
src = fetchgit {
url = "https://github.com/elm/compiler";
sha256 = "0s93z9vr0vp5w894ghc5s34nsq09sg1msf59zfiba87sid5vgjqy";
rev = "32059a289d27e303fa1665e9ada0a52eb688f302";
sha256 = "13jks6c6i80z71mjjfg46ri570g5ini0k3xw3857v6z66zcl56x4";
rev = "d5cbc41aac23da463236bbc250933d037da4055a";
};
isLibrary = false;
isExecutable = true;