diff options
| author | Anders Papitto <anderspapitto@gmail.com> | 2017-05-30 20:48:06 +0700 |
|---|---|---|
| committer | Anders Papitto <anderspapitto@gmail.com> | 2017-06-10 15:15:50 -0700 |
| commit | 1e0866e06483087059af91b7f296e0c5610f8848 (patch) | |
| tree | c8fdf1ce934a96d83f4c881ced3997026ee02555 /pkgs/applications/networking | |
| parent | 53835c93cb4bc1c6228ee04d6788398a8ab36ab4 (diff) | |
| download | nixpkgs-1e0866e06483087059af91b7f296e0c5610f8848.tar nixpkgs-1e0866e06483087059af91b7f296e0c5610f8848.tar.gz nixpkgs-1e0866e06483087059af91b7f296e0c5610f8848.tar.bz2 nixpkgs-1e0866e06483087059af91b7f296e0c5610f8848.tar.lz nixpkgs-1e0866e06483087059af91b7f296e0c5610f8848.tar.xz nixpkgs-1e0866e06483087059af91b7f296e0c5610f8848.tar.zst nixpkgs-1e0866e06483087059af91b7f296e0c5610f8848.zip | |
rust: 1.15.0 -> 1.17.0
Also updates beta, nightly, nightlyBin, and bootstrap compilers. Also updates the registry. Also consolidates logic between bootstrap and nightlyBin compilers. Also contains some miscellaneous cleanups. Also patches firefox to build with the newer cargo
Diffstat (limited to 'pkgs/applications/networking')
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/cargo-fix.patch | 33 | ||||
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/packages.nix | 2 |
2 files changed, 35 insertions, 0 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/cargo-fix.patch b/pkgs/applications/networking/browsers/firefox/cargo-fix.patch new file mode 100644 index 00000000000..bb19e9e45a3 --- /dev/null +++ b/pkgs/applications/networking/browsers/firefox/cargo-fix.patch @@ -0,0 +1,33 @@ +diff --git a/media/libstagefright/binding/mp4parse-cargo.patch b/media/libstagefright/binding/mp4parse-cargo.patch +index 1dd13d2..f98b722 100644 +--- a/media/libstagefright/binding/mp4parse-cargo.patch ++++ b/media/libstagefright/binding/mp4parse-cargo.patch +@@ -27,12 +27,13 @@ diff --git a/media/libstagefright/binding/mp4parse_capi/Cargo.toml b/media/libst + index aeeebc65..5c0836a 100644 + --- a/media/libstagefright/binding/mp4parse_capi/Cargo.toml + +++ b/media/libstagefright/binding/mp4parse_capi/Cargo.toml +-@@ -18,18 +18,10 @@ exclude = [ ++@@ -18,17 +18,12 @@ exclude = [ + "*.mp4", + ] + + -build = "build.rs" +-- +++build = false +++ + [dependencies] + byteorder = "1.0.0" + "mp4parse" = {version = "0.6.0", path = "../mp4parse"} +diff --git a/media/libstagefright/binding/mp4parse_capi/Cargo.toml b/media/libstagefright/binding/mp4parse_capi/Cargo.toml +index aee7ee9..d7e3f55 100644 +--- a/media/libstagefright/binding/mp4parse_capi/Cargo.toml ++++ b/media/libstagefright/binding/mp4parse_capi/Cargo.toml +@@ -18,6 +18,8 @@ exclude = [ + "*.mp4", + ] + ++build = false ++ + [dependencies] + byteorder = "1.0.0" + "mp4parse" = {version = "0.6.0", path = "../mp4parse"} diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index c15e070fefb..8f117e1416b 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -12,6 +12,8 @@ rec { sha512 = "cef5de1e9d6ddf6509a80cd30169fdce701b2fed022979ba5931ccea7b8f77cb644b01984dae028d350e32321cfe2eefc0236c0731bf5a2be12a994fc3fc1118"; }; + patches = [ ./cargo-fix.patch ]; + meta = { description = "A web browser built from Firefox source tree"; homepage = http://www.mozilla.com/en-US/firefox/; |