mirror of
https://github.com/CHN-beta/nixpkgs.git
synced 2026-01-13 11:30:35 +08:00
chromium/source: Move update.nix to parent dir
We now should have only the default.nix left in the source directory and we can start to factor out the pieces into the Chromium main derivation attributes. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
This commit is contained in:
@@ -4,7 +4,7 @@
|
||||
|
||||
with stdenv.lib;
|
||||
|
||||
with (import ./update.nix {
|
||||
with (import ../update.nix {
|
||||
inherit (stdenv) system;
|
||||
}).getChannel channel;
|
||||
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
{ system ? builtins.currentSystem }:
|
||||
|
||||
let
|
||||
inherit (import ../../../../../../. {
|
||||
inherit (import ../../../../../. {
|
||||
inherit system;
|
||||
}) lib runCommand writeText stdenv curl cacert nix;
|
||||
|
||||
sources = if builtins.pathExists ../upstream-info.nix
|
||||
then import ../upstream-info.nix
|
||||
sources = if builtins.pathExists ./upstream-info.nix
|
||||
then import ./upstream-info.nix
|
||||
else {};
|
||||
|
||||
bucketURL = "https://commondatastorage.googleapis.com/"
|
||||
@@ -1,4 +1,4 @@
|
||||
#!/bin/sh -e
|
||||
cd "$(dirname "$0")"
|
||||
sp="$(nix-build -Q --no-out-link source/update.nix -A update)"
|
||||
sp="$(nix-build -Q --no-out-link update.nix -A update)"
|
||||
cat "$sp" > upstream-info.nix
|
||||
|
||||
Reference in New Issue
Block a user