alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

emscriptenPackages: s/overrideDerivation/overrideAttrs

Browse source 
https://nixos.org/manual/nixpkgs/stable/#sec-pkg-overrideDerivation

> Do not use this function in Nixpkgs as it evaluates a Derivation before modifying it, which breaks package abstraction and removes error-checking of function arguments
This commit is contained in:
Artturin 2023-02-23 18:09:09 +02:00
parent 54140dd47f
commit 06567334be
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/languages-frameworks/emscripten.section.md
View file

@ -56,7 +56,7 @@ See the `zlib` example:
zlib = (pkgs.zlib.override { zlib = (pkgs.zlib.override {
stdenv = pkgs.emscriptenStdenv; stdenv = pkgs.emscriptenStdenv;
}).overrideDerivation }).overrideAttrs
(old: rec { (old: rec {
buildInputs = old.buildInputs ++ [ pkg-config ]; buildInputs = old.buildInputs ++ [ pkg-config ];
# we need to reset this setting! # we need to reset this setting!

6
pkgs/top-level/emscripten-packages.nix
View file

@ -8,7 +8,7 @@ with pkgs;
rec { rec {
json_c = (pkgs.json_c.override { json_c = (pkgs.json_c.override {
stdenv = pkgs.emscriptenStdenv; stdenv = pkgs.emscriptenStdenv;
}).overrideDerivation }).overrideAttrs
(old: { (old: {
nativeBuildInputs = [ pkg-config cmake ]; nativeBuildInputs = [ pkg-config cmake ];
propagatedBuildInputs = [ zlib ]; propagatedBuildInputs = [ zlib ];
@ -47,7 +47,7 @@ rec {
libxml2 = (pkgs.libxml2.override { libxml2 = (pkgs.libxml2.override {
stdenv = emscriptenStdenv; stdenv = emscriptenStdenv;
pythonSupport = false; pythonSupport = false;
}).overrideDerivation }).overrideAttrs
(old: { (old: {
propagatedBuildInputs = [ zlib ]; propagatedBuildInputs = [ zlib ];
nativeBuildInputs = (old.nativeBuildInputs or []) ++ [ pkg-config ]; nativeBuildInputs = (old.nativeBuildInputs or []) ++ [ pkg-config ];
@ -138,7 +138,7 @@ rec {
zlib = (pkgs.zlib.override { zlib = (pkgs.zlib.override {
stdenv = pkgs.emscriptenStdenv; stdenv = pkgs.emscriptenStdenv;
}).overrideDerivation }).overrideAttrs
(old: { (old: {
nativeBuildInputs = (old.nativeBuildInputs or []) ++ [ pkg-config ]; nativeBuildInputs = (old.nativeBuildInputs or []) ++ [ pkg-config ];
# we need to reset this setting! # we need to reset this setting!