forked from mirrors/nixpkgs
Merge pull request #176475 from vlinkz/calamaresupdates
This commit is contained in:
commit
86c4f203c1
|
@ -18,7 +18,8 @@
|
|||
extraGSettingsOverrides = ''
|
||||
[org.gnome.shell]
|
||||
welcome-dialog-last-shown-version='9999999999'
|
||||
|
||||
[org.gnome.desktop.session]
|
||||
idle-delay=0
|
||||
[org.gnome.settings-daemon.plugins.power]
|
||||
sleep-inactive-ac-type='nothing'
|
||||
sleep-inactive-battery-type='nothing'
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "calamares-nixos-extensions";
|
||||
version = "0.3.8";
|
||||
version = "0.3.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NixOS";
|
||||
repo = "calamares-nixos-extensions";
|
||||
rev = version;
|
||||
sha256 = "MtqAOwlY5euVNAGRl2pRkbg/OolJPNOSQcR4DS5gFz4=";
|
||||
sha256 = "YJyK0rsrftrCwYD+aCAkPe/kAqUXsP/4WBAGtNKIGj8=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
@ -7,12 +7,12 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "calamares";
|
||||
version = "3.2.57";
|
||||
version = "3.2.59";
|
||||
|
||||
# release including submodule
|
||||
src = fetchurl {
|
||||
url = "https://github.com/calamares/calamares/releases/download/v${version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "ef7f564ec2cd8baaf94a44982ce1db88c1192696617f21538d0b8472a63b4c2b";
|
||||
sha256 = "55adef250613e80a868f2aa3d1e57bdae5b769387d91decf0fe2b64e3605574f";
|
||||
};
|
||||
|
||||
patches = lib.optionals nixos-extensions [
|
||||
|
@ -57,7 +57,7 @@ mkDerivation rec {
|
|||
|
||||
postPatch = ''
|
||||
# Run calamares without root. Other patches make it functional as a normal user
|
||||
sed -e "s,pkexec calamares,calamares," \
|
||||
sed -e "s,pkexec calamares,calamares -D6," \
|
||||
-i calamares.desktop
|
||||
|
||||
sed -e "s,X-AppStream-Ignore=true,&\nStartupWMClass=calamares," \
|
||||
|
|
Loading…
Reference in a new issue