diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2021-01-19 13:50:04 +0100 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2021-01-19 13:50:04 +0100 |
commit | fc7bd322dfcd204ce6daa95285ff358999ff9a8d (patch) | |
tree | 152ad62f3f30148a64a247fc583af45c80cab40c /pkgs/top-level/emscripten-packages.nix | |
parent | 2d91ad963fe799fce74cf52d8d9ea2d4bc963a93 (diff) | |
parent | 1d26caa746f7eda613c5e87342889e55b9e5ba96 (diff) | |
download | nixpkgs-fc7bd322dfcd204ce6daa95285ff358999ff9a8d.tar nixpkgs-fc7bd322dfcd204ce6daa95285ff358999ff9a8d.tar.gz nixpkgs-fc7bd322dfcd204ce6daa95285ff358999ff9a8d.tar.bz2 nixpkgs-fc7bd322dfcd204ce6daa95285ff358999ff9a8d.tar.lz nixpkgs-fc7bd322dfcd204ce6daa95285ff358999ff9a8d.tar.xz nixpkgs-fc7bd322dfcd204ce6daa95285ff358999ff9a8d.tar.zst nixpkgs-fc7bd322dfcd204ce6daa95285ff358999ff9a8d.zip |
Merge branch 'staging-next' into staging
Diffstat (limited to 'pkgs/top-level/emscripten-packages.nix')
-rw-r--r-- | pkgs/top-level/emscripten-packages.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/top-level/emscripten-packages.nix b/pkgs/top-level/emscripten-packages.nix index ff636097004..9ae97cdf35a 100644 --- a/pkgs/top-level/emscripten-packages.nix +++ b/pkgs/top-level/emscripten-packages.nix @@ -10,7 +10,7 @@ rec { stdenv = pkgs.emscriptenStdenv; }).overrideDerivation (old: { - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; propagatedBuildInputs = [ zlib ]; buildInputs = old.buildInputs ++ [ automake autoconf ]; configurePhase = '' @@ -49,7 +49,7 @@ rec { }).overrideDerivation (old: { propagatedBuildInputs = [ zlib ]; - buildInputs = old.buildInputs ++ [ pkgconfig ]; + buildInputs = old.buildInputs ++ [ pkg-config ]; # just override it with nothing so it does not fail autoreconfPhase = "echo autoreconfPhase not used..."; @@ -84,8 +84,8 @@ rec { pname = "xmlmirror"; version = "unstable-2016-06-05"; - buildInputs = [ pkgconfig autoconf automake libtool gnumake libxml2 nodejs openjdk json_c ]; - nativeBuildInputs = [ pkgconfig zlib ]; + buildInputs = [ pkg-config autoconf automake libtool gnumake libxml2 nodejs openjdk json_c ]; + nativeBuildInputs = [ pkg-config zlib ]; src = pkgs.fetchgit { url = "https://gitlab.com/odfplugfest/xmlmirror.git"; @@ -136,7 +136,7 @@ rec { stdenv = pkgs.emscriptenStdenv; }).overrideDerivation (old: { - buildInputs = old.buildInputs ++ [ pkgconfig ]; + buildInputs = old.buildInputs ++ [ pkg-config ]; # we need to reset this setting! NIX_CFLAGS_COMPILE=""; configurePhase = '' |