parent
39247f8d04
commit
4b4c0164f0
@ -21,7 +21,7 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "malcontent";
|
pname = "malcontent";
|
||||||
version = "0.6.0";
|
version = "0.7.0";
|
||||||
|
|
||||||
outputs = [ "bin" "out" "dev" "man" "installedTests" ];
|
outputs = [ "bin" "out" "dev" "man" "installedTests" ];
|
||||||
|
|
||||||
@ -30,16 +30,12 @@ stdenv.mkDerivation rec {
|
|||||||
owner = "pwithnall";
|
owner = "pwithnall";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "COh6N3CmLIcxx6tW4jcP0m6TZv0Z1YJUM/nlG0RzYHQ=";
|
sha256 = "cP2l6nl6cuBQYwkmBj8APu/vH3jTeScXf3ffcuSfqlM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
# Allow installing installed tests to a separate output.
|
# Allow installing installed tests to a separate output.
|
||||||
./installed-tests-path.patch
|
./installed-tests-path.patch
|
||||||
|
|
||||||
# This is unnecessary and breaks when submodules are not available.
|
|
||||||
# https://gitlab.freedesktop.org/pwithnall/malcontent/merge_requests/3
|
|
||||||
./use-system-dependencies.patch
|
|
||||||
];
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
@ -1,15 +0,0 @@
|
|||||||
diff --git a/meson.build b/meson.build
|
|
||||||
index 3575224..0abea63 100644
|
|
||||||
--- a/meson.build
|
|
||||||
+++ b/meson.build
|
|
||||||
@@ -40,9 +40,8 @@ polkit_gobject = dependency('polkit-gobject-1')
|
|
||||||
polkitpolicydir = polkit_gobject.get_pkgconfig_variable('policydir',
|
|
||||||
define_variable: ['prefix', prefix])
|
|
||||||
|
|
||||||
-libglib_testing = subproject('libglib-testing')
|
|
||||||
libglib_testing_dep = dependency(
|
|
||||||
- 'libglib-testing',
|
|
||||||
+ 'glib-testing-0',
|
|
||||||
fallback: ['libglib-testing', 'libglib_testing_dep'],
|
|
||||||
)
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user