diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-12-31 12:00:36 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-12-31 12:00:36 +0100 |
| commit | 070290bda7972072a531c7e79a29bd005ebb84df (patch) | |
| tree | 572922a35ba554a97ff4771875f3a265fb8ce0e1 /pkgs/tools/package-management | |
| parent | ec1f78d1cb6ac86743ffb797bf88d4633b91e733 (diff) | |
| parent | 42575040fc64c1f5560c1cd1d1fdf0fd5e5d4b49 (diff) | |
| download | nixlib-070290bda7972072a531c7e79a29bd005ebb84df.tar nixlib-070290bda7972072a531c7e79a29bd005ebb84df.tar.gz nixlib-070290bda7972072a531c7e79a29bd005ebb84df.tar.bz2 nixlib-070290bda7972072a531c7e79a29bd005ebb84df.tar.lz nixlib-070290bda7972072a531c7e79a29bd005ebb84df.tar.xz nixlib-070290bda7972072a531c7e79a29bd005ebb84df.tar.zst nixlib-070290bda7972072a531c7e79a29bd005ebb84df.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/package-management')
| -rw-r--r-- | pkgs/tools/package-management/nix/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/tools/package-management/opkg/default.nix | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index ea03570bb3e5..e6beee0b38ce 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -51,10 +51,11 @@ let preConfigure = # Copy libboost_context so we don't get all of Boost in our closure. # https://github.com/NixOS/nixpkgs/issues/45462 - lib.optionalString is20 - '' + if is20 then '' mkdir -p $out/lib cp ${boost}/lib/libboost_context* $out/lib + '' else '' + configureFlagsArray+=(BDW_GC_LIBS="-lgc -lgccpp") ''; configureFlags = diff --git a/pkgs/tools/package-management/opkg/default.nix b/pkgs/tools/package-management/opkg/default.nix index 677dbda7b495..df1fe5f80f2f 100644 --- a/pkgs/tools/package-management/opkg/default.nix +++ b/pkgs/tools/package-management/opkg/default.nix @@ -2,11 +2,11 @@ , autoreconfHook }: stdenv.mkDerivation rec { - version = "0.3.6"; + version = "0.4.0"; name = "opkg-${version}"; src = fetchurl { url = "https://downloads.yoctoproject.org/releases/opkg/opkg-${version}.tar.gz"; - sha256 = "02ykhjpyxmh0qrqvc1s3vlhnr6wyxkcwqb8dplxqmkz83gkg01zn"; + sha256 = "1zp6gyggqv359myagjsr0knq66ax64q3irx889kqzbd2v0ahbh7n"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; |