Merge pull request #46710 from jerith666/elm-glsl-fix
Elm: widen language-glsl dependency, pick up minor updates
This commit is contained in:
commit
0e33c56662
|
@ -1,4 +1,6 @@
|
||||||
{ lib, stdenv, buildEnv, haskell, nodejs, fetchurl, makeWrapper, git }:
|
{ lib, stdenv, buildEnv
|
||||||
|
, haskell, nodejs
|
||||||
|
, fetchurl, fetchpatch, makeWrapper, git }:
|
||||||
|
|
||||||
# To update:
|
# To update:
|
||||||
|
|
||||||
|
@ -90,6 +92,12 @@ let
|
||||||
export ELM_HOME=`pwd`/.elm
|
export ELM_HOME=`pwd`/.elm
|
||||||
'' + (makeDotElm "0.19.0" (import ./packages/elm-elm.nix));
|
'' + (makeDotElm "0.19.0" (import ./packages/elm-elm.nix));
|
||||||
buildTools = drv.buildTools or [] ++ [ makeWrapper ];
|
buildTools = drv.buildTools or [] ++ [ makeWrapper ];
|
||||||
|
patches = [
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://github.com/elm/compiler/pull/1784/commits/78d2d8eab310552b1b877a3e90e1e57e7a09ddec.patch";
|
||||||
|
sha256 = "0vdhk16xqm2hxw12s1b91a0bmi8w4wsxc086qlzglgnjxrl5b3w4";
|
||||||
|
})
|
||||||
|
];
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
wrapProgram $out/bin/elm \
|
wrapProgram $out/bin/elm \
|
||||||
--prefix PATH ':' ${lib.makeBinPath [ nodejs ]}
|
--prefix PATH ':' ${lib.makeBinPath [ nodejs ]}
|
||||||
|
|
|
@ -11,8 +11,8 @@ mkDerivation {
|
||||||
version = "0.19.0";
|
version = "0.19.0";
|
||||||
src = fetchgit {
|
src = fetchgit {
|
||||||
url = "https://github.com/elm/compiler";
|
url = "https://github.com/elm/compiler";
|
||||||
sha256 = "0s93z9vr0vp5w894ghc5s34nsq09sg1msf59zfiba87sid5vgjqy";
|
sha256 = "13jks6c6i80z71mjjfg46ri570g5ini0k3xw3857v6z66zcl56x4";
|
||||||
rev = "32059a289d27e303fa1665e9ada0a52eb688f302";
|
rev = "d5cbc41aac23da463236bbc250933d037da4055a";
|
||||||
};
|
};
|
||||||
isLibrary = false;
|
isLibrary = false;
|
||||||
isExecutable = true;
|
isExecutable = true;
|
||||||
|
|
Loading…
Reference in a new issue