cross: use upstream iio-sensor-proxy fix
This commit is contained in:
parent
6e523e7162
commit
33b41482e2
|
@ -200,6 +200,15 @@ in [
|
|||
hash = "sha256-uNerTwyFzivTU+o9bEKmNMFceOmy2AKONfKJWI5qkzo=";
|
||||
})
|
||||
|
||||
(fetchpatch' {
|
||||
# fixes iio-sensor-proxy cross-compilation
|
||||
# merged 2023/08/01
|
||||
title = "iio-sensor-proxy: 3.0 -> 3.5, cleanup";
|
||||
prUrl = "https://github.com/NixOS/nixpkgs/pull/245773";
|
||||
hash = "sha256-6Ho3A+xyVJoip+y5ioc/U8nPZ9O1SlvLenuzkYEAbuo=";
|
||||
})
|
||||
|
||||
|
||||
(fetchpatch' {
|
||||
title = "gthumb: make the webservices feature be optional";
|
||||
prUrl = "https://github.com/NixOS/nixpkgs/pull/240602";
|
||||
|
@ -286,6 +295,11 @@ in [
|
|||
saneCommit = "e2cbfb1bc81afadc5d31c18d43e774fa9a985f98";
|
||||
hash = "sha256-7Q9Fjp7xrw3e887inc5cc01OvuOhThnVYduSLNtv2d0=";
|
||||
})
|
||||
(fetchpatch' {
|
||||
title = "iio-sensor-proxy: support cross compilation";
|
||||
saneCommit = "dc1c3341fef6c64d5fbc983670819cf7932f5be1";
|
||||
hash = "sha256-lSVGjNepRLMfLgaAG3zv/BfoEhJg8yX7EqaCgu8/b8I=";
|
||||
})
|
||||
(fetchpatch' {
|
||||
title = "mpvScripts.mpris: support cross compilation";
|
||||
saneCommit = "f7cd92e2afa26852ccf53f8ca59c13d82bf7bf64";
|
||||
|
@ -335,14 +349,6 @@ in [
|
|||
# hash = "sha256-g+p96OrBOQAwwH7nwHBuM/KGeIrnBzh9u9lL0M0sYWo=";
|
||||
# })
|
||||
|
||||
(fetchpatch' {
|
||||
# fixes iio-sensor-proxy cross-compilation
|
||||
# merged 2023/08/01
|
||||
title = "iio-sensor-proxy: 3.0 -> 3.5, cleanup";
|
||||
prUrl = "https://github.com/NixOS/nixpkgs/pull/245773";
|
||||
hash = "sha256-6Ho3A+xyVJoip+y5ioc/U8nPZ9O1SlvLenuzkYEAbuo=";
|
||||
})
|
||||
|
||||
# (fetchpatch' {
|
||||
# # N.B.: compiles, but runtime error on launch suggestive of some module not being shipped
|
||||
# title = "matrix-appservice-irc: 0.38.0 -> 1.0.0";
|
||||
|
|
|
@ -618,14 +618,14 @@ in {
|
|||
# });
|
||||
|
||||
# fixes "ERROR: Program 'glib-compile-resources' not found or not executable
|
||||
# 2023/07/31: upstreaming is unblocked on servo
|
||||
# 2023/08/01: upstreaming is unblocked,implemented on servo
|
||||
# - different failure mode though:
|
||||
# - "configure: error: cannot run C compiled programs"
|
||||
# - "If you meant to cross compile, use `--host`"
|
||||
# nixpkgs merged 3.0 -> 3.5 update
|
||||
# - <https://github.com/NixOS/nixpkgs/pull/245773/files>
|
||||
# - still needs glib in native build inputs
|
||||
iio-sensor-proxy = addNativeInputs [ final.glib ] prev.iio-sensor-proxy;
|
||||
# iio-sensor-proxy = addNativeInputs [ final.glib ] prev.iio-sensor-proxy;
|
||||
|
||||
# fixes: "make: gcc: No such file or directory"
|
||||
java-service-wrapper = useEmulatedStdenv prev.java-service-wrapper;
|
||||
|
|
Loading…
Reference in New Issue
Block a user