Commit 06567334 authored by Artturin's avatar Artturin
Browse files

emscriptenPackages: s/overrideDerivation/overrideAttrs 

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
parent 54140dd4

doc/languages-frameworks/emscripten.section.md

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ See the `zlib` example: 


    zlib = (pkgs.zlib.override {

      stdenv = pkgs.emscriptenStdenv;

    }).overrideDerivation

    }).overrideAttrs

    (old: rec {

      buildInputs = old.buildInputs ++ [ pkg-config ];

      # we need to reset this setting!

pkgs/top-level/emscripten-packages.nix

+3 −3
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ with pkgs; 
rec {

  json_c = (pkgs.json_c.override {

    stdenv = pkgs.emscriptenStdenv;

  }).overrideDerivation

  }).overrideAttrs

    (old: {

      nativeBuildInputs = [ pkg-config cmake ];

      propagatedBuildInputs = [ zlib ];
@@ -47,7 +47,7 @@ rec { 
  libxml2 = (pkgs.libxml2.override {

    stdenv = emscriptenStdenv;

    pythonSupport = false;

  }).overrideDerivation

  }).overrideAttrs

    (old: {

      propagatedBuildInputs = [ zlib ];

      nativeBuildInputs = (old.nativeBuildInputs or []) ++ [ pkg-config ];
@@ -138,7 +138,7 @@ rec { 


  zlib = (pkgs.zlib.override {

    stdenv = pkgs.emscriptenStdenv;

  }).overrideDerivation

  }).overrideAttrs

    (old: {

      nativeBuildInputs = (old.nativeBuildInputs or []) ++ [ pkg-config ];

      # we need to reset this setting!