diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2020-03-26 02:06:00 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2020-04-08 17:08:14 +0200 |
| commit | 4b4c0164f018ff612a296c2f33f8492d9597c5cc (patch) | |
| tree | 41563738f6a9651bea3d80b9b07ab645d21563f2 /pkgs/development/libraries/malcontent | |
| parent | 39247f8d04c04b3ee629a1f85aeedd582bf41cac (diff) | |
| download | nixpkgs-4b4c0164f018ff612a296c2f33f8492d9597c5cc.tar nixpkgs-4b4c0164f018ff612a296c2f33f8492d9597c5cc.tar.gz nixpkgs-4b4c0164f018ff612a296c2f33f8492d9597c5cc.tar.bz2 nixpkgs-4b4c0164f018ff612a296c2f33f8492d9597c5cc.tar.lz nixpkgs-4b4c0164f018ff612a296c2f33f8492d9597c5cc.tar.xz nixpkgs-4b4c0164f018ff612a296c2f33f8492d9597c5cc.tar.zst nixpkgs-4b4c0164f018ff612a296c2f33f8492d9597c5cc.zip | |
malcontent: 0.6.0 → 0.7.0
https://gitlab.freedesktop.org/pwithnall/malcontent/commit/2e8a07d58c047f757e36a5fcf1d5b76faae08e75
Diffstat (limited to 'pkgs/development/libraries/malcontent')
| -rw-r--r-- | pkgs/development/libraries/malcontent/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/development/libraries/malcontent/use-system-dependencies.patch | 15 |
2 files changed, 2 insertions, 21 deletions
diff --git a/pkgs/development/libraries/malcontent/default.nix b/pkgs/development/libraries/malcontent/default.nix index bd8988390c9..8bc2ada9b65 100644 --- a/pkgs/development/libraries/malcontent/default.nix +++ b/pkgs/development/libraries/malcontent/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pname = "malcontent"; - version = "0.6.0"; + version = "0.7.0"; outputs = [ "bin" "out" "dev" "man" "installedTests" ]; @@ -30,16 +30,12 @@ stdenv.mkDerivation rec { owner = "pwithnall"; repo = pname; rev = version; - sha256 = "COh6N3CmLIcxx6tW4jcP0m6TZv0Z1YJUM/nlG0RzYHQ="; + sha256 = "cP2l6nl6cuBQYwkmBj8APu/vH3jTeScXf3ffcuSfqlM="; }; patches = [ # Allow installing installed tests to a separate output. ./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 = [ diff --git a/pkgs/development/libraries/malcontent/use-system-dependencies.patch b/pkgs/development/libraries/malcontent/use-system-dependencies.patch deleted file mode 100644 index 8920b1f4a99..00000000000 --- a/pkgs/development/libraries/malcontent/use-system-dependencies.patch +++ /dev/null @@ -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'], - ) - |