Unverified Commit 0adce209 authored by Maciej Krüger's avatar Maciej Krüger Committed by GitHub
Browse files

Merge pull request #200018 from bobby285271/cinnamon-gnome-terminal 

Closes https://github.com/NixOS/nixpkgs/issues/200017
parents 25528d7a 1528a7ca

pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix

+13 −1
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
, runCommand

, nixos-artwork

, glib

, gnome

, gtk3

, gsettings-desktop-schemas

, extraGSettingsOverrides ? ""
@@ -35,9 +36,20 @@ let 
    cinnamon-session

    cinnamon-settings-daemon

    cinnamon-common

    gnome.gnome-terminal

    gtk3

  ] ++ extraGSettingsOverridePackages;



  gsettingsOverrides = ''

    # Use Fedora's default to make text readable and

    # restore ununified menu.

    # https://github.com/NixOS/nixpkgs/issues/200017

    [org.gnome.Terminal.Legacy.Settings]

    theme-variant='dark'

    unified-menu=false



    ${extraGSettingsOverrides}

  '';

in



# TODO: Having https://github.com/NixOS/nixpkgs/issues/54150 would supersede this
@@ -53,7 +65,7 @@ runCommand "cinnamon-gsettings-overrides" { preferLocalBuild = true; } 
    chmod -R a+w "$data_dir"



    cat - > "$schema_dir/nixos-defaults.gschema.override" <<- EOF

    ${extraGSettingsOverrides}

    ${gsettingsOverrides}

    EOF



    ${glib.dev}/bin/glib-compile-schemas --strict "$schema_dir"