diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-08-14 00:02:54 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-08-14 00:02:54 +0000 |
| commit | f9abd30e11337cf07034f2cc8ad1691aa4a69386 (patch) | |
| tree | c3b5c34b1c533f5c231dc6707e96795fb3a9a138 /nixpkgs/pkgs/desktops/gnome-3/apps | |
| parent | 44e04ea2730f8e3b863b81b0056babe233c244f6 (diff) | |
| parent | 1036dc664169b32613ec11b58cc1740c7511a340 (diff) | |
| download | nixlib-f9abd30e11337cf07034f2cc8ad1691aa4a69386.tar nixlib-f9abd30e11337cf07034f2cc8ad1691aa4a69386.tar.gz nixlib-f9abd30e11337cf07034f2cc8ad1691aa4a69386.tar.bz2 nixlib-f9abd30e11337cf07034f2cc8ad1691aa4a69386.tar.lz nixlib-f9abd30e11337cf07034f2cc8ad1691aa4a69386.tar.xz nixlib-f9abd30e11337cf07034f2cc8ad1691aa4a69386.tar.zst nixlib-f9abd30e11337cf07034f2cc8ad1691aa4a69386.zip | |
Merge commit '1036dc664169b32613ec11b58cc1740c7511a340'
Diffstat (limited to 'nixpkgs/pkgs/desktops/gnome-3/apps')
4 files changed, 0 insertions, 13 deletions
diff --git a/nixpkgs/pkgs/desktops/gnome-3/apps/gedit/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/gedit/default.nix index 532e8dcb0f08..2dcd265e2e48 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/apps/gedit/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/apps/gedit/default.nix @@ -32,10 +32,6 @@ stdenv.mkDerivation rec { patchShebangs plugins/externaltools/scripts/gedit-tool-merge.pl ''; - mesonFlags = [ - "--buildtype=plain" # don't require git - ]; - # Reliably fails to generate gedit-file-browser-enum-types.h in time enableParallelBuilding = false; diff --git a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-books/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-books/default.nix index b9fb2dc05a06..6edf86ec552b 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-books/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-books/default.nix @@ -14,10 +14,6 @@ stdenv.mkDerivation rec { sha256 = "1wkcywcwwszj9mldr0lngczqdz7hys08rr1nd2k6rs8ykzs2z7m4"; }; - mesonFlags = [ - "--buildtype=plain" - ]; - nativeBuildInputs = [ meson ninja pkgconfig gettext libxslt desktop-file-utils docbook_xsl docbook_xml_dtd_42 wrapGAppsHook python3 diff --git a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix index 6f171d744a55..e0f28bc3446d 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix @@ -19,7 +19,6 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dgetting-started=true" - "--buildtype=plain" ]; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix index 0a33a3bff559..9d08cc24aadb 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix @@ -34,10 +34,6 @@ in stdenv.mkDerivation rec { dbus ]; - mesonFlags = [ - "--buildtype=plain" # don't do any git commands - ]; - postPatch = '' chmod +x meson_post_install.py patchShebangs meson_post_install.py |