about summary refs log tree commit diff
path: root/nixpkgs/pkgs/applications/misc
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2019-02-18 01:12:31 +0000
committerAlyssa Ross <hi@alyssa.is>2019-02-18 01:12:31 +0000
commit50053cda79099c9a0b2a7803aef61f730a54848f (patch)
tree6413bbed5cbdd3f58d26d54cbf1b37d54a8c3a22 /nixpkgs/pkgs/applications/misc
parent7fbd32a525182f2089e1098723219a1a4ef264bb (diff)
parent36f316007494c388df1fec434c1e658542e3c3cc (diff)
downloadnixlib-50053cda79099c9a0b2a7803aef61f730a54848f.tar
nixlib-50053cda79099c9a0b2a7803aef61f730a54848f.tar.gz
nixlib-50053cda79099c9a0b2a7803aef61f730a54848f.tar.bz2
nixlib-50053cda79099c9a0b2a7803aef61f730a54848f.tar.lz
nixlib-50053cda79099c9a0b2a7803aef61f730a54848f.tar.xz
nixlib-50053cda79099c9a0b2a7803aef61f730a54848f.tar.zst
nixlib-50053cda79099c9a0b2a7803aef61f730a54848f.zip
Merge commit '36f316007494c388df1fec434c1e658542e3c3cc'
Diffstat (limited to 'nixpkgs/pkgs/applications/misc')
-rw-r--r--nixpkgs/pkgs/applications/misc/digitalbitbox/default.nix2
-rw-r--r--nixpkgs/pkgs/applications/misc/orca/default.nix6
2 files changed, 2 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/applications/misc/digitalbitbox/default.nix b/nixpkgs/pkgs/applications/misc/digitalbitbox/default.nix
index 939e2e9fc166..0272cfd52c08 100644
--- a/nixpkgs/pkgs/applications/misc/digitalbitbox/default.nix
+++ b/nixpkgs/pkgs/applications/misc/digitalbitbox/default.nix
@@ -68,8 +68,6 @@ in stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    # TODO: remove libcap when pruneLibtoolFiles applies to pulseaudio.
-    libcap
     libevent
     libtool
     udev
diff --git a/nixpkgs/pkgs/applications/misc/orca/default.nix b/nixpkgs/pkgs/applications/misc/orca/default.nix
index 5533bf6eeded..e8843c1bd6f7 100644
--- a/nixpkgs/pkgs/applications/misc/orca/default.nix
+++ b/nixpkgs/pkgs/applications/misc/orca/default.nix
@@ -7,16 +7,14 @@
 , speechd, brltty, setproctitle, gst_all_1, gst-python
 }:
 
-let
+buildPythonApplication rec {
   pname = "orca";
   version = "3.30.2";
-in buildPythonApplication rec {
-  name = "${pname}-${version}";
 
   format = "other";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "17asibc46i5gr2fw04jvvdi85zzmxwlnhyq7r6cr3m5prrdr8a53";
   };