From 6041cfe2af8968ffaa0cb80384572beae81d0d5b Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sun, 20 Mar 2016 16:53:08 +0100
Subject: [PATCH] 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>
---
 .../networking/browsers/chromium/source/default.nix         | 2 +-
 .../networking/browsers/chromium/{source => }/update.nix    | 6 +++---
 pkgs/applications/networking/browsers/chromium/update.sh    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename pkgs/applications/networking/browsers/chromium/{source => }/update.nix (98%)

diff --git a/pkgs/applications/networking/browsers/chromium/source/default.nix b/pkgs/applications/networking/browsers/chromium/source/default.nix
index bc646f6b252c..394dd81cc2f2 100644
--- a/pkgs/applications/networking/browsers/chromium/source/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/source/default.nix
@@ -4,7 +4,7 @@
 
 with stdenv.lib;
 
-with (import ./update.nix {
+with (import ../update.nix {
   inherit (stdenv) system;
 }).getChannel channel;
 
diff --git a/pkgs/applications/networking/browsers/chromium/source/update.nix b/pkgs/applications/networking/browsers/chromium/update.nix
similarity index 98%
rename from pkgs/applications/networking/browsers/chromium/source/update.nix
rename to pkgs/applications/networking/browsers/chromium/update.nix
index 41fac2d781d1..d9c4e6a56e40 100644
--- a/pkgs/applications/networking/browsers/chromium/source/update.nix
+++ b/pkgs/applications/networking/browsers/chromium/update.nix
@@ -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/"
diff --git a/pkgs/applications/networking/browsers/chromium/update.sh b/pkgs/applications/networking/browsers/chromium/update.sh
index 461d8b7dd400..df53068713de 100755
--- a/pkgs/applications/networking/browsers/chromium/update.sh
+++ b/pkgs/applications/networking/browsers/chromium/update.sh
@@ -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