swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-22 13:29:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

chromium/source: Move update.nix to parent dir

Browse source 
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:
aszlig 2016-03-20 16:53:08 +01:00
parent 2d9a604907
commit 6041cfe2af
No known key found for this signature in database
GPG key ID: D0EBD0EC8C2DC961
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/applications/networking/browsers/chromium/source/default.nix
View file

@ -4,7 +4,7 @@
with stdenv.lib;
with (import ./update.nix {
with (import ../update.nix {
inherit (stdenv) system;
}).getChannel channel;

6
pkgs/applications/networking/browsers/chromium/source/update.nix → pkgs/applications/networking/browsers/chromium/update.nix
View file

@ -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/"

2
pkgs/applications/networking/browsers/chromium/update.sh
View file

@ -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