commit
10afccf145
@ -0,0 +1,7 @@ |
||||
{ pkgs, ... }: |
||||
|
||||
{ |
||||
imports = [ ./sd-image-aarch64.nix ]; |
||||
|
||||
boot.kernelPackages = pkgs.linuxPackages_latest; |
||||
} |
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,129 @@ |
||||
From 698e34dd6e8d98a1818ae00d3313b69a86340771 Mon Sep 17 00:00:00 2001
|
||||
From: Fabio Valentini <decathorpe@gmail.com>
|
||||
Date: Mon, 17 Dec 2018 14:58:14 +0100
|
||||
Subject: DateTime: include "clock-format" gsettings key here
|
||||
|
||||
---
|
||||
data/io.elementary.granite.gschema.xml | 15 +++++++++++++++
|
||||
data/meson.build | 4 ++++
|
||||
lib/DateTime.vala | 4 ++--
|
||||
meson.build | 11 +++++++++++
|
||||
meson/post_install.py | 5 +++++
|
||||
5 files changed, 37 insertions(+), 2 deletions(-)
|
||||
create mode 100644 data/io.elementary.granite.gschema.xml
|
||||
create mode 100644 data/meson.build
|
||||
|
||||
diff --git a/data/io.elementary.granite.gschema.xml b/data/io.elementary.granite.gschema.xml
|
||||
new file mode 100644
|
||||
index 0000000..1540fb0
|
||||
--- /dev/null
|
||||
+++ b/data/io.elementary.granite.gschema.xml
|
||||
@@ -0,0 +1,15 @@
|
||||
+<?xml version="1.0" encoding="UTF-8"?>
|
||||
+<schemalist>
|
||||
+ <enum id="io.elementary.granite.clock-formats">
|
||||
+ <value nick="12h" value="0" />
|
||||
+ <value nick="24h" value="1" />
|
||||
+ <value nick="ISO8601" value="2" />
|
||||
+ </enum>
|
||||
+ <schema id="io.elementary.granite" path="/io/elementary/granite/">
|
||||
+ <key name="clock-format" enum="io.elementary.granite.clock-formats">
|
||||
+ <default>"12h"</default>
|
||||
+ <summary>Whether the clock displays in 12h or 24h format</summary>
|
||||
+ <description>Whether the clock displays in 12h or 24h format</description>
|
||||
+ </key>
|
||||
+ </schema>
|
||||
+</schemalist>
|
||||
diff --git a/data/meson.build b/data/meson.build
|
||||
new file mode 100644
|
||||
index 0000000..96cc3b1
|
||||
--- /dev/null
|
||||
+++ b/data/meson.build
|
||||
@@ -0,0 +1,4 @@
|
||||
+install_data(
|
||||
+ rdnn + '.gschema.xml',
|
||||
+ install_dir: schema_dir
|
||||
+)
|
||||
diff --git a/lib/DateTime.vala b/lib/DateTime.vala
|
||||
index aea2ec6..3d81191 100644
|
||||
--- a/lib/DateTime.vala
|
||||
+++ b/lib/DateTime.vala
|
||||
@@ -104,13 +104,13 @@ namespace Granite.DateTime {
|
||||
}
|
||||
|
||||
/**
|
||||
- * Gets the //clock-format// key from //org.gnome.desktop.interface// schema
|
||||
+ * Gets the //clock-format// key from //io.elementary.granite// schema
|
||||
* and determines if the clock format is 12h based
|
||||
*
|
||||
* @return true if the clock format is 12h based, false otherwise.
|
||||
*/
|
||||
private static bool is_clock_format_12h () {
|
||||
- var h24_settings = new Settings ("io.elementary.desktop.wingpanel.datetime");
|
||||
+ var h24_settings = new Settings ("io.elementary.granite");
|
||||
var format = h24_settings.get_string ("clock-format");
|
||||
return (format.contains ("12h"));
|
||||
}
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 8b98eeb..f0abcdf 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -4,6 +4,8 @@ project(
|
||||
version: '5.2.2'
|
||||
)
|
||||
|
||||
+rdnn = 'io.elementary.' + meson.project_name()
|
||||
+
|
||||
if meson.get_compiler('vala').version().version_compare('<0.40.0')
|
||||
error('vala compiler version 0.40.0 or newer is required.')
|
||||
endif
|
||||
@@ -52,10 +54,18 @@ icons_dir = join_paths(
|
||||
'hicolor'
|
||||
)
|
||||
|
||||
+schema_dir = join_paths(
|
||||
+ get_option('prefix'),
|
||||
+ get_option('datadir'),
|
||||
+ 'glib-2.0',
|
||||
+ 'schemas'
|
||||
+)
|
||||
+
|
||||
pkgconfig = import('pkgconfig')
|
||||
i18n = import('i18n')
|
||||
|
||||
subdir('lib')
|
||||
+subdir('data')
|
||||
subdir('demo')
|
||||
subdir('icons')
|
||||
subdir('po')
|
||||
@@ -68,5 +78,6 @@ endif
|
||||
meson.add_install_script(
|
||||
join_paths(meson.current_source_dir(), 'meson', 'post_install.py'),
|
||||
'--iconsdir', icons_dir,
|
||||
+ '--schemadir', schema_dir,
|
||||
)
|
||||
|
||||
diff --git a/meson/post_install.py b/meson/post_install.py
|
||||
index 1864515..5313f96 100755
|
||||
--- a/meson/post_install.py
|
||||
+++ b/meson/post_install.py
|
||||
@@ -6,11 +6,16 @@ import subprocess
|
||||
|
||||
parser = argparse.ArgumentParser()
|
||||
parser.add_argument("--iconsdir", action="store", required=True)
|
||||
+parser.add_argument("--schemadir", action="store", required=True)
|
||||
args = vars(parser.parse_args())
|
||||
|
||||
icons_dir = args["iconsdir"]
|
||||
+schema_dir = args["schemadir"]
|
||||
|
||||
if not os.environ.get('DESTDIR'):
|
||||
print('Compiling icon cache ...')
|
||||
subprocess.run(['gtk-update-icon-cache', icons_dir])
|
||||
|
||||
+ print('Compiling GSettings schemas ...')
|
||||
+ subprocess.run(['glib-compile-schemas', schema_dir])
|
||||
+
|
||||
--
|
||||
2.20.1
|
||||
|
@ -0,0 +1,30 @@ |
||||
--- a/googlemock/CMakeLists.txt
|
||||
+++ b/googlemock/CMakeLists.txt
|
||||
@@ -106,10 +106,10 @@
|
||||
if (DEFINED CMAKE_VERSION AND NOT "${CMAKE_VERSION}" VERSION_LESS "2.8.11")
|
||||
target_include_directories(gmock SYSTEM INTERFACE
|
||||
"$<BUILD_INTERFACE:${gmock_build_include_dirs}>"
|
||||
- "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
|
||||
+ "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
|
||||
target_include_directories(gmock_main SYSTEM INTERFACE
|
||||
"$<BUILD_INTERFACE:${gmock_build_include_dirs}>"
|
||||
- "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
|
||||
+ "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
|
||||
endif()
|
||||
|
||||
########################################################################
|
||||
--- a/googletest/CMakeLists.txt
|
||||
+++ b/googletest/CMakeLists.txt
|
||||
@@ -126,10 +126,10 @@
|
||||
if (DEFINED CMAKE_VERSION AND NOT "${CMAKE_VERSION}" VERSION_LESS "2.8.11")
|
||||
target_include_directories(gtest SYSTEM INTERFACE
|
||||
"$<BUILD_INTERFACE:${gtest_build_include_dirs}>"
|
||||
- "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
|
||||
+ "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
|
||||
target_include_directories(gtest_main SYSTEM INTERFACE
|
||||
"$<BUILD_INTERFACE:${gtest_build_include_dirs}>"
|
||||
- "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
|
||||
+ "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
|
||||
endif()
|
||||
target_link_libraries(gtest_main PUBLIC gtest)
|
||||
|
@ -0,0 +1,33 @@ |
||||
{ stdenv, buildPythonPackage, pythonOlder, fetchFromGitHub, cmake, sip }: |
||||
|
||||
buildPythonPackage rec { |
||||
pname = "libsavitar"; |
||||
version = "3.6.0"; |
||||
format = "other"; |
||||
|
||||
src = fetchFromGitHub { |
||||
owner = "Ultimaker"; |
||||
repo = "libSavitar"; |
||||
rev = version; |
||||
sha256 = "1bz8ga0n9aw65hqzajbr93dcv5g555iaihbhs1jq2k47cx66klzv"; |
||||
}; |
||||
|
||||
postPatch = '' |
||||
# To workaround buggy SIP detection which overrides PYTHONPATH |
||||
sed -i '/SET(ENV{PYTHONPATH}/d' cmake/FindSIP.cmake |
||||
''; |
||||
|
||||
nativeBuildInputs = [ cmake ]; |
||||
|
||||
propagatedBuildInputs = [ sip ]; |
||||
|
||||
disabled = pythonOlder "3.4.0"; |
||||
|
||||
meta = with stdenv.lib; { |
||||
description = "C++ implementation of 3mf loading with SIP python bindings"; |
||||
homepage = https://github.com/Ultimaker/libSavitar; |
||||
license = licenses.lgpl3Plus; |
||||
platforms = platforms.linux; |
||||
maintainers = with maintainers; [ abbradar orivej ]; |
||||
}; |
||||
} |
@ -0,0 +1,21 @@ |
||||
diff --git a/pywal/backends/wal.py b/pywal/backends/wal.py
|
||||
index a75fdc5..4339680 100644
|
||||
--- a/pywal/backends/wal.py
|
||||
+++ b/pywal/backends/wal.py
|
||||
@@ -21,15 +21,7 @@ def imagemagick(color_count, img, magick_command):
|
||||
|
||||
def has_im():
|
||||
"""Check to see if the user has im installed."""
|
||||
- if shutil.which("magick"):
|
||||
- return ["magick", "convert"]
|
||||
-
|
||||
- if shutil.which("convert"):
|
||||
- return ["convert"]
|
||||
-
|
||||
- logging.error("Imagemagick wasn't found on your system.")
|
||||
- logging.error("Try another backend. (wal --backend)")
|
||||
- sys.exit(1)
|
||||
+ return ["@convert@"]
|
||||
|
||||
|
||||
def gen_colors(img):
|
@ -0,0 +1,39 @@ |
||||
commit c31faa212e09aa62c232d9008e05976b1cdc9ee5
|
||||
Author: Frederik Rietdijk <fridh@fridh.nl>
|
||||
Date: Wed Dec 26 12:54:32 2018 +0100
|
||||
|
||||
nix: hardcode feh
|
||||
|
||||
diff --git a/pywal/wallpaper.py b/pywal/wallpaper.py
|
||||
index ba61e66..fad34f7 100644
|
||||
--- a/pywal/wallpaper.py
|
||||
+++ b/pywal/wallpaper.py
|
||||
@@ -47,27 +47,7 @@ def xfconf(path, img):
|
||||
|
||||
def set_wm_wallpaper(img):
|
||||
"""Set the wallpaper for non desktop environments."""
|
||||
- if shutil.which("feh"):
|
||||
- util.disown(["feh", "--bg-fill", img])
|
||||
-
|
||||
- elif shutil.which("nitrogen"):
|
||||
- util.disown(["nitrogen", "--set-zoom-fill", img])
|
||||
-
|
||||
- elif shutil.which("bgs"):
|
||||
- util.disown(["bgs", "-z", img])
|
||||
-
|
||||
- elif shutil.which("hsetroot"):
|
||||
- util.disown(["hsetroot", "-fill", img])
|
||||
-
|
||||
- elif shutil.which("habak"):
|
||||
- util.disown(["habak", "-mS", img])
|
||||
-
|
||||
- elif shutil.which("display"):
|
||||
- util.disown(["display", "-backdrop", "-window", "root", img])
|
||||
-
|
||||
- else:
|
||||
- logging.error("No wallpaper setter found.")
|
||||
- return
|
||||
+ return util.disown(["@feh@", "--bg-fill", img])
|
||||
|
||||
|
||||
def set_desktop_wallpaper(desktop, img):
|
Loading…
Reference in new issue