mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-29 00:54:11 +00:00
Code Issues Wiki Activity

Merge pull request #56509 from dotlambda/fix-runtimeShell

Browse source 
fix #56408 mess (runtimeShell)
This commit is contained in:
Robert Schütz 2019-02-28 08:20:56 +01:00 committed by GitHub
parent 90e8b730b1 ca8fd54463
commit c2f358eb3b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/applications/networking/browsers/firefox-bin/default.nix
View file

@ -49,6 +49,7 @@
, gnugrep , gnugrep
, gnupg , gnupg
, ffmpeg , ffmpeg
, runtimeShell
}: }:
let let
@ -191,7 +192,7 @@ stdenv.mkDerivation {
# update with: # update with:
# $ nix-shell maintainers/scripts/update.nix --argstr package firefox-bin-unwrapped # $ nix-shell maintainers/scripts/update.nix --argstr package firefox-bin-unwrapped
passthru.updateScript = import ./update.nix { passthru.updateScript = import ./update.nix {
inherit stdenv name channel writeScript xidel coreutils gnused gnugrep gnupg curl; inherit stdenv name channel writeScript xidel coreutils gnused gnugrep gnupg curl runtimeShell;
baseUrl = baseUrl =
if channel == "devedition" if channel == "devedition"
then "http://archive.mozilla.org/pub/devedition/releases/" then "http://archive.mozilla.org/pub/devedition/releases/"

3
pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
View file

@ -41,6 +41,7 @@
, gnused , gnused
, gnugrep , gnugrep
, gnupg , gnupg
, runtimeShell
}: }:
# imports `version` and `sources` # imports `version` and `sources`
@ -159,7 +160,7 @@ stdenv.mkDerivation {
''; '';
passthru.updateScript = import ./../../browsers/firefox-bin/update.nix { passthru.updateScript = import ./../../browsers/firefox-bin/update.nix {
inherit name stdenv writeScript xidel coreutils gnused gnugrep curl gnupg; inherit name stdenv writeScript xidel coreutils gnused gnugrep curl gnupg runtimeShell;
baseName = "thunderbird"; baseName = "thunderbird";
channel = "release"; channel = "release";
basePath = "pkgs/applications/networking/mailreaders/thunderbird-bin"; basePath = "pkgs/applications/networking/mailreaders/thunderbird-bin";

4
pkgs/applications/networking/mailreaders/thunderbird/default.nix
View file

@ -5,7 +5,7 @@
, hunspell, libevent, libstartup_notification , hunspell, libevent, libstartup_notification
, icu, libpng, jemalloc , icu, libpng, jemalloc
, autoconf213, which, m4 , autoconf213, which, m4
, writeScript, xidel, common-updater-scripts, coreutils, gnused, gnugrep, curl , writeScript, xidel, common-updater-scripts, coreutils, gnused, gnugrep, curl, runtimeShell
, cargo, rustc, llvmPackages , cargo, rustc, llvmPackages
, enableGTK3 ? false, gtk3, gnome3, wrapGAppsHook, makeWrapper , enableGTK3 ? false, gtk3, gnome3, wrapGAppsHook, makeWrapper
, enableCalendar ? true , enableCalendar ? true
@ -193,6 +193,6 @@ in stdenv.mkDerivation rec {
passthru.updateScript = import ./../../browsers/firefox/update.nix { passthru.updateScript = import ./../../browsers/firefox/update.nix {
attrPath = "thunderbird"; attrPath = "thunderbird";
baseUrl = "http://archive.mozilla.org/pub/thunderbird/releases/"; baseUrl = "http://archive.mozilla.org/pub/thunderbird/releases/";
inherit stdenv writeScript lib common-updater-scripts xidel coreutils gnused gnugrep curl; inherit stdenv writeScript lib common-updater-scripts xidel coreutils gnused gnugrep curl runtimeShell;
}; };
} }

4
pkgs/development/web/nodejs/nodejs.nix
View file

@ -1,7 +1,7 @@
{ stdenv, fetchurl, openssl, python2, zlib, libuv, utillinux, http-parser { stdenv, fetchurl, openssl, python2, zlib, libuv, utillinux, http-parser
, pkgconfig, which , pkgconfig, which
# Updater dependencies # Updater dependencies
, writeScript, coreutils, gnugrep, jq, curl, common-updater-scripts, nix , writeScript, coreutils, gnugrep, jq, curl, common-updater-scripts, nix, runtimeShell
, gnupg , gnupg
, darwin, xcbuild , darwin, xcbuild
, procps , procps
@ -104,7 +104,7 @@ in
''; '';
passthru.updateScript = import ./update.nix { passthru.updateScript = import ./update.nix {
inherit stdenv writeScript coreutils gnugrep jq curl common-updater-scripts gnupg nix; inherit stdenv writeScript coreutils gnugrep jq curl common-updater-scripts gnupg nix runtimeShell;
inherit (stdenv) lib; inherit (stdenv) lib;
inherit majorVersion; inherit majorVersion;
}; };