diff --git a/default.nix b/default.nix index 30930bc..e304bf8 100644 --- a/default.nix +++ b/default.nix @@ -1,4 +1,4 @@ -{ pkgs ? import ./nix {} }: +{ pkgs ? import ./nix { overlays = [ (import ./nix/overlay.nix) ]; } }: let ofborgOverrides = { diff --git a/nix/nixpkgs.json b/nix/nixpkgs.json index dde64ed..714a1d7 100644 --- a/nix/nixpkgs.json +++ b/nix/nixpkgs.json @@ -1,7 +1,7 @@ { "url": "https://github.com/nixos/nixpkgs-channels.git", - "rev": "201d739b0ffbebceb444864d1856babcd1a666a8", - "date": "2018-12-30T01:29:37+00:00", - "sha256": "0mfkzmylglpw84w85zs3djpspcx45bg3s62hk4j44dxl2p0fvggj", + "rev": "e2b4abe3c8f2e09adfc6a52007841d1b96c89371", + "date": "2020-02-19T01:57:21+01:00", + "sha256": "1l3jfr74s7wmx3fk5y76ayazbfclvnr532kg1hypbzydp3n372rz", "fetchSubmodules": false } diff --git a/nix/overlay.nix b/nix/overlay.nix new file mode 100644 index 0000000..7e1b7a5 --- /dev/null +++ b/nix/overlay.nix @@ -0,0 +1,12 @@ +(self: super: { + defaultCrateOverrides = super.defaultCrateOverrides // { + openssl-sys = attrs: { + buildInputs = [ self.openssl_1_0_2 ]; + nativeBuildInputs = [ self.pkgconfig ]; + }; + openssl = attrs: { + DEP_OPENSSL_VERSION = "102"; + }; + }; +}) + diff --git a/php/default.nix b/php/default.nix index d839f37..552a660 100644 --- a/php/default.nix +++ b/php/default.nix @@ -4,10 +4,11 @@ let composerEnv = import ./composer-env.nix { - inherit (pkgs) stdenv writeTextFile fetchurl php unzip; + inherit (pkgs) stdenv writeTextFile fetchurl unzip; + php = pkgs.php72; }; in import ./php-packages.nix { inherit composerEnv noDev; inherit (pkgs) fetchurl fetchgit fetchhg fetchsvn; -} \ No newline at end of file +} diff --git a/release.nix b/release.nix index 9693e2e..ac2e774 100644 --- a/release.nix +++ b/release.nix @@ -15,7 +15,12 @@ let (collector: system: collector // { "${system}" = import ./. { - pkgs = import nixpkgs { inherit system; }; + pkgs = import nixpkgs { + inherit system; + overlays = [ + (import ./nix/overlay.nix) + ]; + }; }; } )