diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2019-09-09 06:08:13 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-09-09 06:08:13 +0100 |
commit | 3c5b794214bce4274d6dac34eda7f2c88f5a5884 (patch) | |
tree | b533615a7e59e291dcff5793e00586dbf9d1417e /pkgs/applications/office | |
parent | 4b929acf6739c1a60616f2a1edaf513b8e3dcc84 (diff) | |
parent | 7b8fb5c06cc28a9ed2bbe605de44570ad6c8fecc (diff) | |
download | nixlib-3c5b794214bce4274d6dac34eda7f2c88f5a5884.tar nixlib-3c5b794214bce4274d6dac34eda7f2c88f5a5884.tar.gz nixlib-3c5b794214bce4274d6dac34eda7f2c88f5a5884.tar.bz2 nixlib-3c5b794214bce4274d6dac34eda7f2c88f5a5884.tar.lz nixlib-3c5b794214bce4274d6dac34eda7f2c88f5a5884.tar.xz nixlib-3c5b794214bce4274d6dac34eda7f2c88f5a5884.tar.zst nixlib-3c5b794214bce4274d6dac34eda7f2c88f5a5884.zip |
Merge pull request #67552 from volth/quotes
treewide: remove redundant quotes
Diffstat (limited to 'pkgs/applications/office')
5 files changed, 5 insertions, 5 deletions
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"; }; |