diff options
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r-- | pkgs/development/libraries/flatbuffers/1.12.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/libfm/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/mbedtls/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/silgraphite/graphite2.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/t1lib/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/zeroc-ice/3.6.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/zeroc-ice/default.nix | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/development/libraries/flatbuffers/1.12.nix b/pkgs/development/libraries/flatbuffers/1.12.nix index df2980ba204f3..1ad490d3a01bc 100644 --- a/pkgs/development/libraries/flatbuffers/1.12.nix +++ b/pkgs/development/libraries/flatbuffers/1.12.nix @@ -20,7 +20,7 @@ callPackage ./generic.nix { }) ]; - preConfigure = lib.optional stdenv.buildPlatform.isDarwin '' + preConfigure = lib.optionalString stdenv.buildPlatform.isDarwin '' rm BUILD ''; } diff --git a/pkgs/development/libraries/libfm/default.nix b/pkgs/development/libraries/libfm/default.nix index 255ddfa22ad7c..5d7389b6d1881 100644 --- a/pkgs/development/libraries/libfm/default.nix +++ b/pkgs/development/libraries/libfm/default.nix @@ -13,7 +13,7 @@ let gtk = if withGtk3 then gtk3 else gtk2; - inherit (lib) optional; + inherit (lib) optional optionalString; in stdenv.mkDerivation rec { pname = if extraOnly @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { installFlags = [ "sysconfdir=${placeholder "out"}/etc" ]; # libfm-extra is pulled in by menu-cache and thus leads to a collision for libfm - postInstall = optional (!extraOnly) '' + postInstall = optionalString (!extraOnly) '' rm $out/lib/libfm-extra.so $out/lib/libfm-extra.so.* $out/lib/libfm-extra.la $out/lib/pkgconfig/libfm-extra.pc ''; diff --git a/pkgs/development/libraries/mbedtls/default.nix b/pkgs/development/libraries/mbedtls/default.nix index 90e2c9bd9a735..9210f18ed9623 100644 --- a/pkgs/development/libraries/mbedtls/default.nix +++ b/pkgs/development/libraries/mbedtls/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { strictDeps = true; - postConfigure = lib.optionals enableThreading '' + postConfigure = lib.optionalString enableThreading '' perl scripts/config.pl set MBEDTLS_THREADING_C # Threading abstraction layer perl scripts/config.pl set MBEDTLS_THREADING_PTHREAD # POSIX thread wrapper layer for the threading layer. ''; diff --git a/pkgs/development/libraries/silgraphite/graphite2.nix b/pkgs/development/libraries/silgraphite/graphite2.nix index 25f4b5e131773..b047d68707463 100644 --- a/pkgs/development/libraries/silgraphite/graphite2.nix +++ b/pkgs/development/libraries/silgraphite/graphite2.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { # Remove a test that fails to statically link (undefined reference to png and # freetype symbols) - postConfigure = lib.optionals static '' + postConfigure = lib.optionalString static '' sed -e '/freetype freetype.c/d' -i ../tests/examples/CMakeLists.txt ''; diff --git a/pkgs/development/libraries/t1lib/default.nix b/pkgs/development/libraries/t1lib/default.nix index 495993a64ab6f..5bd4b02b61d90 100644 --- a/pkgs/development/libraries/t1lib/default.nix +++ b/pkgs/development/libraries/t1lib/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { buildInputs = [ libX11 libXaw ]; buildFlags = [ "without_doc" ]; - postInstall = lib.optional (!stdenv.isDarwin) "chmod +x $out/lib/*.so.*"; # ?? + postInstall = lib.optionalString (!stdenv.isDarwin) "chmod +x $out/lib/*.so.*"; # ?? meta = with lib; { description = "A type 1 font rasterizer library for UNIX/X11"; diff --git a/pkgs/development/libraries/zeroc-ice/3.6.nix b/pkgs/development/libraries/zeroc-ice/3.6.nix index 896973e32eb8c..725af51487c88 100644 --- a/pkgs/development/libraries/zeroc-ice/3.6.nix +++ b/pkgs/development/libraries/zeroc-ice/3.6.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { sourceRoot=$sourceRoot/cpp ''; - prePatch = lib.optional stdenv.isDarwin '' + prePatch = lib.optionalString stdenv.isDarwin '' substituteInPlace config/Make.rules.Darwin \ --replace xcrun "" ''; diff --git a/pkgs/development/libraries/zeroc-ice/default.nix b/pkgs/development/libraries/zeroc-ice/default.nix index ef16e381bcfd7..f522c18103970 100644 --- a/pkgs/development/libraries/zeroc-ice/default.nix +++ b/pkgs/development/libraries/zeroc-ice/default.nix @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-Wno-error=class-memaccess -Wno-error=deprecated-copy"; - prePatch = lib.optional stdenv.isDarwin '' + prePatch = lib.optionalString stdenv.isDarwin '' substituteInPlace Make.rules.Darwin \ --replace xcrun "" ''; |