Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 6bce1acd26f6
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2ed7dfe245c7
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Sep 30, 2019

  1. libproxy: build with spidermonkey_60

    @worldofpeace
    worldofpeace committed Sep 30, 2019
    Copy the full SHA
    44f8f39 View commit details

Commits on Oct 1, 2019

  1. Merge pull request #70065 from worldofpeace/libproxy-19.09/fixbuild 

    [19.09] libproxy: build with spidermonkey_60
    @worldofpeace
    worldofpeace authored Oct 1, 2019
    Copy the full SHA
    2ed7dfe View commit details
Showing with 17 additions and 3 deletions.
  1. +17 −3 pkgs/development/libraries/libproxy/default.nix
20 changes: 17 additions & 3 deletions pkgs/development/libraries/libproxy/default.nix
View file
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@
, fetchpatch
, dbus
, networkmanager
, spidermonkey_38
, spidermonkey_60
, pcre
, gsettings-desktop-schemas
, glib
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
JavaScriptCore
] else [
glib
spidermonkey_38
spidermonkey_60
dbus
networkmanager
]);
@@ -59,7 +59,21 @@ stdenv.mkDerivation rec {
"-DPYTHON3_SITEPKG_DIR=${placeholder "py3"}/${python3.sitePackages}"
];

patches = stdenv.lib.optionals stdenv.isDarwin [
patches = [
# Make build with spidermonkey_60
(fetchpatch {
url = "https://github.com/libproxy/libproxy/pull/86.patch";
sha256 = "17c06ilinrnzr7xnnmw9pc6zrncyaxcdd6r6k1ah5p156skbykfs";
})
(fetchpatch {
url = "https://github.com/libproxy/libproxy/pull/87.patch";
sha256 = "0sagzfwm16f33inbkwsp88w9wmrd034rjmw0y8d122f7k1qfx6zc";
})
(fetchpatch {
url = "https://github.com/libproxy/libproxy/pull/95.patch";
sha256 = "18vyr6wlis9zfwml86606jpgb9mss01l9aj31iiciml8p857aixi";
})
] ++ stdenv.lib.optionals stdenv.isDarwin [
(fetchpatch {
url = "https://github.com/libproxy/libproxy/commit/44158f03f8522116758d335688ed840dfcb50ac8.patch";
sha256 = "0axfvb6j7gcys6fkwi9dkn006imhvm3kqr83gpwban8419n0q5v1";