diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-11-28 18:59:07 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-11-28 18:59:07 +0100 |
| commit | cbd2305d4dad93142e4fa17ca7935c6d215d981f (patch) | |
| tree | faf2ca2dda19a66aec3a9c7d39d5a3f49e58b1d0 /pkgs/applications/networking/browsers | |
| parent | d2688fd6955ae3d215a684bd86777515fc644349 (diff) | |
| parent | f9c96df1d5d8cf6db264c41cb2de227636381203 (diff) | |
| download | nixlib-cbd2305d4dad93142e4fa17ca7935c6d215d981f.tar nixlib-cbd2305d4dad93142e4fa17ca7935c6d215d981f.tar.gz nixlib-cbd2305d4dad93142e4fa17ca7935c6d215d981f.tar.bz2 nixlib-cbd2305d4dad93142e4fa17ca7935c6d215d981f.tar.lz nixlib-cbd2305d4dad93142e4fa17ca7935c6d215d981f.tar.xz nixlib-cbd2305d4dad93142e4fa17ca7935c6d215d981f.tar.zst nixlib-cbd2305d4dad93142e4fa17ca7935c6d215d981f.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/applications/networking/browsers')
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/common.nix | 1 | ||||
| -rw-r--r-- | pkgs/applications/networking/browsers/rekonq/default.nix | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index cfdddf288566..dea816e5be9b 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -190,6 +190,7 @@ let libExecPath="${libExecPath}" python build/linux/unbundle/replace_gyp_files.py ${gypFlags} python build/gyp_chromium -f ninja --depth "$(pwd)" ${gypFlags} + find . -iname '*.py[co]' -delete ''; buildPhase = let diff --git a/pkgs/applications/networking/browsers/rekonq/default.nix b/pkgs/applications/networking/browsers/rekonq/default.nix index 3deabd42e013..ce36e26d6fcc 100644 --- a/pkgs/applications/networking/browsers/rekonq/default.nix +++ b/pkgs/applications/networking/browsers/rekonq/default.nix @@ -3,11 +3,11 @@ assert builtins.compareVersions "4.8.3" kde4.release != 1; # https://bugs.kde.org/show_bug.cgi?id=306077 stdenv.mkDerivation rec { - name = "rekonq-1.80"; # >=1.80 need kde >=4.9.0 + name = "rekonq-2.4.2"; # >=1.80 need kde >=4.9.0 src = fetchurl { - url = "mirror://sourceforge/rekonq/${name}.tar.bz2"; - sha256 = "1lzmg8psy1j1v8vrmsyw609jv9scgnigdivx97fb4spb7x6sxn4g"; + url = "mirror://sourceforge/rekonq/${name}.tar.xz"; + sha256 = "09jihyf4xl7bwfwahwwbx6f11h3zqljccchnpl4mijljylr5p079"; }; buildInputs = [ kde4.kdelibs qca2 qoauth ]; |