Merge staging into staging-next
This commit is contained in:
@@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "autoconf-archive";
|
||||
version = "2019.01.06";
|
||||
version = "2021.02.19";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/autoconf-archive/autoconf-archive-${version}.tar.xz";
|
||||
sha256 = "0gqya7nf4j5k98dkky0c3bnr0paciya91vkqazg7knlq621mq68p";
|
||||
sha256 = "sha256-6KbrnSjdy6j/7z+iEWUyOem/I5q6agGmt8/Hzq7GnL0=";
|
||||
};
|
||||
|
||||
buildInputs = [ xz ];
|
||||
|
||||
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
|
||||
./jsfalse_to_null.patch
|
||||
];
|
||||
|
||||
buildInputs = [ autoconf makedepend perl python unzip zip ];
|
||||
nativeBuildInputs = [ unzip ];
|
||||
buildInputs = [ autoconf makedepend perl python zip ];
|
||||
|
||||
# It works without MOZ_FIX_LINK_PATHS, circumventing an impurity
|
||||
# issue. Maybe we could kick js/ (spidermonkey) completely and
|
||||
|
||||
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
|
||||
sha256 = "b59841a519e75d5b6566848a2c5be2f91455bf0cc6ae4d688fcbd4c40db934d5";
|
||||
};
|
||||
|
||||
buildInputs = [unzip];
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
||||
installPhase = ''
|
||||
install -Dm755 bin/premake $out/bin/premake
|
||||
|
||||
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
|
||||
categories = "Development";
|
||||
};
|
||||
|
||||
buildInputs = [ unzip ];
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
||||
installPhase = ''
|
||||
# Copy prebuilt app to $out
|
||||
|
||||
Reference in New Issue
Block a user