diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-10-02 00:23:05 +0300 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-10-02 00:44:10 +0300 |
| commit | f5dd3a703d0b4924005a4eebc66091d8d926d6e5 (patch) | |
| tree | b56d3fd34b3d1949c1aad13d079fef59cbf2c6f3 /pkgs/tools | |
| parent | 82c0aa7d85183da8031d4c0ac7fd562887d03b89 (diff) | |
treewide: Fix more lib.optional misuses
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/archivers/dar/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/misc/alarm-clock-applet/default.nix | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/tools/archivers/dar/default.nix b/pkgs/tools/archivers/dar/default.nix index b64b6e4ca0a2d..83a73eb388f8d 100644 --- a/pkgs/tools/archivers/dar/default.nix +++ b/pkgs/tools/archivers/dar/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ zlib bzip2 openssl lzo libgcrypt gpgme xz ] - ++ stdenv.lib.optional stdenv.isLinux [ attr e2fsprogs ]; + ++ stdenv.lib.optionals stdenv.isLinux [ attr e2fsprogs ]; configureFlags = [ "--disable-dar-static" ]; diff --git a/pkgs/tools/misc/alarm-clock-applet/default.nix b/pkgs/tools/misc/alarm-clock-applet/default.nix index 88992c8e4e305..b089240bcc69e 100644 --- a/pkgs/tools/misc/alarm-clock-applet/default.nix +++ b/pkgs/tools/misc/alarm-clock-applet/default.nix @@ -29,7 +29,6 @@ stdenv.mkDerivation rec { glib gtk2 gst_all_1.gstreamer - gst_plugins gnome2.GConf gnome2.gnome_icon_theme libnotify @@ -37,7 +36,7 @@ stdenv.mkDerivation rec { libunique intltool wrapGAppsHook - ]; + ] ++ gst_plugins; propagatedUserEnvPkgs = [ gnome2.GConf.out ]; |