diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-19 00:01:36 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-19 00:01:36 +0000 |
| commit | dc802b2e196f95ce42daa7591e475bba34047331 (patch) | |
| tree | e490c9bceea445e1eff80d7e883b5621e2c29bec /pkgs/development/compilers | |
| parent | e15af378fb53182b63f645c34e4f01cc5879912c (diff) | |
| parent | d5bd34ebf2c2c2b380b76cb86bc68522bc6af4d7 (diff) | |
| download | nixpkgs-dc802b2e196f95ce42daa7591e475bba34047331.tar nixpkgs-dc802b2e196f95ce42daa7591e475bba34047331.tar.gz nixpkgs-dc802b2e196f95ce42daa7591e475bba34047331.tar.bz2 nixpkgs-dc802b2e196f95ce42daa7591e475bba34047331.tar.lz nixpkgs-dc802b2e196f95ce42daa7591e475bba34047331.tar.xz nixpkgs-dc802b2e196f95ce42daa7591e475bba34047331.tar.zst nixpkgs-dc802b2e196f95ce42daa7591e475bba34047331.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/apache-flex-sdk/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/compilers/vala/default.nix | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/compilers/apache-flex-sdk/default.nix b/pkgs/development/compilers/apache-flex-sdk/default.nix index 800b1ea55e3..5b5b21aa73d 100644 --- a/pkgs/development/compilers/apache-flex-sdk/default.nix +++ b/pkgs/development/compilers/apache-flex-sdk/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { buildInputs = [ jre ]; - buildPhase = ":"; + dontBuild = true; postPatch = '' shopt -s extglob @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { cp ${playerglobal} $t/frameworks/libs/player/${playerglobal_ver}/playerglobal.swc ''; - fixupPhase = ":"; + dontFixup = true; meta = with lib; { description = "Flex SDK for Adobe Flash / ActionScript"; diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index 69d5789bfb0..e3a005564d0 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -100,7 +100,7 @@ let homepage = "https://wiki.gnome.org/Projects/Vala"; license = licenses.lgpl21Plus; platforms = platforms.unix; - maintainers = with maintainers; [ antono jtojnar peterhoeg ]; + maintainers = with maintainers; [ antono jtojnar peterhoeg maxeaubrey ]; }; }); |