summary refs log tree commit diff
path: root/pkgs/applications/audio
diff options
context:
space:
mode:
authorMarek Mahut <marek.mahut@gmail.com>2019-08-15 15:37:19 +0200
committerGitHub <noreply@github.com>2019-08-15 15:37:19 +0200
commit26c6802a5880ff433252380faf428acc598b9b5d (patch)
tree0a4971baff0176e0d1299a89a05e96a577ec3f2b /pkgs/applications/audio
parentd13a1bc93a4ace5f3d26a037d672ff34a07860fb (diff)
parented0cb5cf589c266f2217cccbb83ed782f8b926be (diff)
downloadnixpkgs-26c6802a5880ff433252380faf428acc598b9b5d.tar
nixpkgs-26c6802a5880ff433252380faf428acc598b9b5d.tar.gz
nixpkgs-26c6802a5880ff433252380faf428acc598b9b5d.tar.bz2
nixpkgs-26c6802a5880ff433252380faf428acc598b9b5d.tar.lz
nixpkgs-26c6802a5880ff433252380faf428acc598b9b5d.tar.xz
nixpkgs-26c6802a5880ff433252380faf428acc598b9b5d.tar.zst
nixpkgs-26c6802a5880ff433252380faf428acc598b9b5d.zip
Merge pull request #66637 from jonringer/bump-pamixer
pamixer: 1.3.1 -> 1.4
Diffstat (limited to 'pkgs/applications/audio')
-rw-r--r--pkgs/applications/audio/pamixer/default.nix15
1 files changed, 4 insertions, 11 deletions
diff --git a/pkgs/applications/audio/pamixer/default.nix b/pkgs/applications/audio/pamixer/default.nix
index 322a4e23846..7c452096785 100644
--- a/pkgs/applications/audio/pamixer/default.nix
+++ b/pkgs/applications/audio/pamixer/default.nix
@@ -1,27 +1,20 @@
 { stdenv, fetchFromGitHub, fetchpatch, boost, libpulseaudio }:
 
 stdenv.mkDerivation rec {
-  name = "pamixer-${version}";
-  version = "1.3.1";
+  pname = "pamixer";
+  version = "1.4";
 
   src = fetchFromGitHub {
     owner = "cdemoulins";
     repo = "pamixer";
     rev = version;
-    sha256 = "15zs2x4hnrpxphqn542b6qqm4ymvhkvbcfyffy69d6cki51chzzw";
+    sha256 = "1i14550n8paijwwnhksv5izgfqm3s5q2773bdfp6vyqybkll55f7";
   };
 
-  # Remove after https://github.com/cdemoulins/pamixer/pull/16 gets fixed
-  patches = [(fetchpatch {
-    url = "https://github.com/oxij/pamixer/commit/dea1cd967aa837940e5c0b04ef7ebc47a7a93d63.patch";
-    sha256 = "0s77xmsiwywyyp6f4bjxg1sqdgms1k5fiy7na6ws0aswshfnzfjb";
-  })];
-
   buildInputs = [ boost libpulseaudio ];
 
   installPhase = ''
-    mkdir -p $out/bin
-    cp pamixer $out/bin
+    install -Dm755 pamixer -t $out/bin
   '';
 
   meta = with stdenv.lib; {