From 7b8fb5c06cc28a9ed2bbe605de44570ad6c8fecc Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sun, 8 Sep 2019 23:38:31 +0000
Subject: treewide: remove redundant quotes

---
 pkgs/applications/office/libreoffice/default.nix  | 2 +-
 pkgs/applications/office/libreoffice/still.nix    | 2 +-
 pkgs/applications/office/libreoffice/wrapper.nix  | 2 +-
 pkgs/applications/office/paperless/withConfig.nix | 2 +-
 pkgs/applications/office/wordgrinder/default.nix  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'pkgs/applications/office')

diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index b5cfefd78209..f5f53e10496b 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -279,7 +279,7 @@ in stdenv.mkDerivation rec {
   '';
 
   configureFlags = [
-    "${if withHelp then "" else "--without-help"}"
+    (if withHelp then "" else "--without-help")
     "--with-boost=${boost.dev}"
     "--with-boost-libdir=${boost.out}/lib"
     "--with-beanshell-jar=${bsh}"
diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix
index 9f04cd83c10d..eb774a309416 100644
--- a/pkgs/applications/office/libreoffice/still.nix
+++ b/pkgs/applications/office/libreoffice/still.nix
@@ -279,7 +279,7 @@ in stdenv.mkDerivation rec {
   '';
 
   configureFlags = [
-    "${if withHelp then "" else "--without-help"}"
+    (if withHelp then "" else "--without-help")
     "--with-boost=${boost.dev}"
     "--with-boost-libdir=${boost.out}/lib"
     "--with-beanshell-jar=${bsh}"
diff --git a/pkgs/applications/office/libreoffice/wrapper.nix b/pkgs/applications/office/libreoffice/wrapper.nix
index ce8910d76d45..08b01a4a051b 100644
--- a/pkgs/applications/office/libreoffice/wrapper.nix
+++ b/pkgs/applications/office/libreoffice/wrapper.nix
@@ -2,7 +2,7 @@
 let
   jdk = libreoffice.jdk;
 in
-(runCommand "${libreoffice.name}" {
+(runCommand libreoffice.name {
   inherit dbus libreoffice jdk bash;
 } ''
   mkdir -p "$out/bin"
diff --git a/pkgs/applications/office/paperless/withConfig.nix b/pkgs/applications/office/paperless/withConfig.nix
index aafdfe67adb4..652d1478c0ca 100644
--- a/pkgs/applications/office/paperless/withConfig.nix
+++ b/pkgs/applications/office/paperless/withConfig.nix
@@ -39,7 +39,7 @@ let
     PAPERLESS_CONSUMPTION_DIR = "${dataDir}/consume";
     PAPERLESS_MEDIADIR = "${dataDir}/media";
     PAPERLESS_STATICDIR = "${dataDir}/static";
-    PAPERLESS_DBDIR = "${dataDir}";
+    PAPERLESS_DBDIR = dataDir;
   }) // config;
 
   envVarDefs = mapAttrsToList (n: v: ''export ${n}="${toString v}"'') envVars;
diff --git a/pkgs/applications/office/wordgrinder/default.nix b/pkgs/applications/office/wordgrinder/default.nix
index 3e4ca0ae975f..199f17afda79 100644
--- a/pkgs/applications/office/wordgrinder/default.nix
+++ b/pkgs/applications/office/wordgrinder/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     repo = "wordgrinder";
     owner = "davidgiven";
-    rev = "${version}";
+    rev = version;
     sha256 = "08lnq5wmspfqdjmqm15gizcq0xr7mg4h62qhvwj63v0sd6ks1cal";
   };
 
-- 
cgit 1.4.1