diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-08-14 00:02:54 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-08-14 00:02:54 +0000 |
| commit | f9abd30e11337cf07034f2cc8ad1691aa4a69386 (patch) | |
| tree | c3b5c34b1c533f5c231dc6707e96795fb3a9a138 /nixpkgs/pkgs/applications/audio | |
| parent | 44e04ea2730f8e3b863b81b0056babe233c244f6 (diff) | |
| parent | 1036dc664169b32613ec11b58cc1740c7511a340 (diff) | |
| download | nixlib-f9abd30e11337cf07034f2cc8ad1691aa4a69386.tar nixlib-f9abd30e11337cf07034f2cc8ad1691aa4a69386.tar.gz nixlib-f9abd30e11337cf07034f2cc8ad1691aa4a69386.tar.bz2 nixlib-f9abd30e11337cf07034f2cc8ad1691aa4a69386.tar.lz nixlib-f9abd30e11337cf07034f2cc8ad1691aa4a69386.tar.xz nixlib-f9abd30e11337cf07034f2cc8ad1691aa4a69386.tar.zst nixlib-f9abd30e11337cf07034f2cc8ad1691aa4a69386.zip | |
Merge commit '1036dc664169b32613ec11b58cc1740c7511a340'
Diffstat (limited to 'nixpkgs/pkgs/applications/audio')
3 files changed, 14 insertions, 7 deletions
diff --git a/nixpkgs/pkgs/applications/audio/ncmpc/default.nix b/nixpkgs/pkgs/applications/audio/ncmpc/default.nix index 67fe983c26fd..a35d9c670fe8 100644 --- a/nixpkgs/pkgs/applications/audio/ncmpc/default.nix +++ b/nixpkgs/pkgs/applications/audio/ncmpc/default.nix @@ -15,6 +15,12 @@ stdenv.mkDerivation rec { buildInputs = [ glib ncurses mpd_clientlib boost ]; nativeBuildInputs = [ meson ninja pkgconfig gettext ]; + mesonFlags = [ + "-Dlirc=disabled" + "-Dregex=disabled" + "-Ddocumentation=disabled" + ]; + meta = with stdenv.lib; { description = "Curses-based interface for MPD (music player daemon)"; homepage = https://www.musicpd.org/clients/ncmpc/; diff --git a/nixpkgs/pkgs/applications/audio/radiotray-ng/default.nix b/nixpkgs/pkgs/applications/audio/radiotray-ng/default.nix index 91d82d686d03..c0186a146bee 100644 --- a/nixpkgs/pkgs/applications/audio/radiotray-ng/default.nix +++ b/nixpkgs/pkgs/applications/audio/radiotray-ng/default.nix @@ -39,14 +39,14 @@ let pythonInputs = with python2.pkgs; [ python2 lxml ]; in stdenv.mkDerivation rec { - name = "radiotray-ng-${version}"; - version = "0.2.5"; + pname = "radiotray-ng"; + version = "0.2.6"; src = fetchFromGitHub { owner = "ebruck"; repo = "radiotray-ng"; rev = "v${version}"; - sha256 = "1crvpn1mgrv7bd2k683mpgs59785mkrjvmp1f14iyq4qrr0f9zzi"; + sha256 = "0khrfxjas2ldh0kksq7l811srqy16ahjxchvz0hhykx5hykymxlb"; }; nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook makeWrapper ]; @@ -64,9 +64,10 @@ stdenv.mkDerivation rec { patches = [ ./no-dl-googletest.patch ]; postPatch = '' - for x in debian/CMakeLists.txt include/radiotray-ng/common.hpp data/*.desktop; do + for x in package/CMakeLists.txt include/radiotray-ng/common.hpp data/*.desktop; do substituteInPlace $x --replace /usr $out done + substituteInPlace package/CMakeLists.txt --replace /etc/xdg/autostart $out/etc/xdg/autostart # We don't find the radiotray-ng-notification icon otherwise substituteInPlace data/radiotray-ng.desktop \ diff --git a/nixpkgs/pkgs/applications/audio/radiotray-ng/no-dl-googletest.patch b/nixpkgs/pkgs/applications/audio/radiotray-ng/no-dl-googletest.patch index 3578d2d72b03..3aee97516560 100644 --- a/nixpkgs/pkgs/applications/audio/radiotray-ng/no-dl-googletest.patch +++ b/nixpkgs/pkgs/applications/audio/radiotray-ng/no-dl-googletest.patch @@ -1,4 +1,4 @@ -From 2ce91cd2244e61d54e0c0a3b26851912240b0667 Mon Sep 17 00:00:00 2001 +From b6f7a9e2e0194c6baed63a33b7beff359080b8d9 Mon Sep 17 00:00:00 2001 From: Will Dietz <w@wdtz.org> Date: Sat, 16 Mar 2019 11:40:00 -0500 Subject: [PATCH] don't download googletest @@ -9,7 +9,7 @@ Subject: [PATCH] don't download googletest 2 files changed, 19 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index fc1b9de..301c266 100644 +index ddba1be..3396705 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -70,25 +70,7 @@ endif() @@ -51,5 +51,5 @@ index 859c048..58ab5c2 100644 target_include_directories(${target} PRIVATE ${JSONCPP_INCLUDE_DIRS}) gtest_discover_tests(${target}) -- -2.21.GIT +2.22.0 |