diff options
Diffstat (limited to 'pkgs/applications')
6 files changed, 59 insertions, 29 deletions
diff --git a/pkgs/applications/emulators/citra/generic.nix b/pkgs/applications/emulators/citra/generic.nix index c167aef7e7743..d247a181e07cb 100644 --- a/pkgs/applications/emulators/citra/generic.nix +++ b/pkgs/applications/emulators/citra/generic.nix @@ -34,7 +34,7 @@ , enableQtTranslation ? enableQt, qttools , enableWebService ? true , enableCubeb ? true, cubeb -, useDiscordRichPresence ? true, rapidjson +, useDiscordRichPresence ? false, rapidjson }: stdenv.mkDerivation { inherit pname version src; @@ -72,23 +72,25 @@ stdenv.mkDerivation { ++ lib.optional useDiscordRichPresence rapidjson; cmakeFlags = [ - "-DUSE_SYSTEM_LIBS=ON" + (lib.cmakeBool "USE_SYSTEM_LIBS" true) - "-DDISABLE_SYSTEM_DYNARMIC=ON" - "-DDISABLE_SYSTEM_GLSLANG=ON" # The following imported targets are referenced, but are missing: SPIRV-Tools-opt - "-DDISABLE_SYSTEM_LODEPNG=ON" # Not packaged in nixpkgs - "-DDISABLE_SYSTEM_VMA=ON" - "-DDISABLE_SYSTEM_XBYAK=ON" + (lib.cmakeBool "DISABLE_SYSTEM_DYNARMIC" true) + (lib.cmakeBool "DISABLE_SYSTEM_GLSLANG" true) # The following imported targets are referenced, but are missing: SPIRV-Tools-opt + (lib.cmakeBool "DISABLE_SYSTEM_LODEPNG" true) # Not packaged in nixpkgs + (lib.cmakeBool "DISABLE_SYSTEM_VMA" true) + (lib.cmakeBool "DISABLE_SYSTEM_XBYAK" true) # We don't want to bother upstream with potentially outdated compat reports - "-DCITRA_ENABLE_COMPATIBILITY_REPORTING=ON" - "-DENABLE_COMPATIBILITY_LIST_DOWNLOAD=OFF" # We provide this deterministically - ] ++ lib.optional (!enableSdl2Frontend) "-DENABLE_SDL2_FRONTEND=OFF" - ++ lib.optional (!enableQt) "-DENABLE_QT=OFF" - ++ lib.optional enableQtTranslation "-DENABLE_QT_TRANSLATION=ON" - ++ lib.optional (!enableWebService) "-DENABLE_WEB_SERVICE=OFF" - ++ lib.optional (!enableCubeb) "-DENABLE_CUBEB=OFF" - ++ lib.optional useDiscordRichPresence "-DUSE_DISCORD_PRESENCE=ON"; + (lib.cmakeBool "CITRA_ENABLE_COMPATIBILITY_REPORTING" true) + (lib.cmakeBool "ENABLE_COMPATIBILITY_LIST_DOWNLOAD" false) # We provide this deterministically + + (lib.cmakeBool "ENABLE_SDL2_FRONTEND" enableSdl2Frontend) + (lib.cmakeBool "ENABLE_QT" enableQt) + (lib.cmakeBool "ENABLE_QT_TRANSLATION" enableQtTranslation) + (lib.cmakeBool "ENABLE_WEB_SERVICE" enableWebService) + (lib.cmakeBool "ENABLE_CUBEB" enableCubeb) + (lib.cmakeBool "USE_DISCORD_PRESENCE" useDiscordRichPresence) + ]; # causes redefinition of _FORTIFY_SOURCE hardeningDisable = [ "fortify3" ]; diff --git a/pkgs/applications/misc/monitorcontrol/default.nix b/pkgs/applications/misc/monitorcontrol/default.nix index 6c3a1ccec34e7..b5a6935958e23 100644 --- a/pkgs/applications/misc/monitorcontrol/default.nix +++ b/pkgs/applications/misc/monitorcontrol/default.nix @@ -14,14 +14,6 @@ stdenv.mkDerivation rec { }; # MonitorControl.${version}.dmg is APFS formatted, unpack with 7zz - unpackCmd = '' - runHook preUnpack - - 7zz x $src - - runHook postUnpack - ''; - nativeBuildInputs = [ _7zz ]; sourceRoot = "MonitorControl.app"; diff --git a/pkgs/applications/misc/tableplus/default.nix b/pkgs/applications/misc/tableplus/default.nix new file mode 100644 index 0000000000000..c53f89582b45a --- /dev/null +++ b/pkgs/applications/misc/tableplus/default.nix @@ -0,0 +1,37 @@ +{ lib +, fetchurl +, undmg +, stdenv +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "tableplus"; + version = "504"; + src = fetchurl { + url = "https://download.tableplus.com/macos/${finalAttrs.version}/TablePlus.dmg"; + hash = "sha256-YFUquv71QFEnlmh93+HsFN6XtgoUx6CMOVqfdWAIWfo="; + }; + + sourceRoot = "TablePlus.app"; + + nativeBuildInputs = [ undmg ]; + + installPhase = '' + runHook preInstall + + mkdir -p "$out/Applications/TablePlus.app" + cp -R . "$out/Applications/TablePlus.app" + mkdir "$out/bin" + ln -s "$out/Applications/TablePlus.app/Contents/MacOS/TablePlus" "$out/bin/${finalAttrs.pname}" + + runHook postInstall + ''; + + meta = with lib; { + description = "Database management made easy"; + homepage = "https://tableplus.com"; + license = licenses.unfree; + maintainers = with maintainers; [ yamashitax ]; + platforms = platforms.darwin; + }; +}) diff --git a/pkgs/applications/networking/sync/storj-uplink/default.nix b/pkgs/applications/networking/sync/storj-uplink/default.nix index e7ed00d786306..db26d084e797f 100644 --- a/pkgs/applications/networking/sync/storj-uplink/default.nix +++ b/pkgs/applications/networking/sync/storj-uplink/default.nix @@ -5,18 +5,18 @@ buildGoModule rec { pname = "storj-uplink"; - version = "1.98.2"; + version = "1.99.1"; src = fetchFromGitHub { owner = "storj"; repo = "storj"; rev = "v${version}"; - hash = "sha256-XnTrQIDUHdW9HwnYRigGFMGmcSCBhdoTXT4xlMCMeCw="; + hash = "sha256-UzuKy3pwl+chwYUWtcUEJIrU8wpSg3o2mVryc3qA9EM="; }; subPackages = [ "cmd/uplink" ]; - vendorHash = "sha256-n7exLjiDyvnoKAKnJXo1Ag+jh1Ccb2eA3Yv5fg7gkDk="; + vendorHash = "sha256-RaZ+yEkzsu/V3734joWtVA2m2vCOW+CnjF5s0mwDI/0="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix index 2e8c5bd1f6035..4798e324141d6 100644 --- a/pkgs/applications/virtualization/OVMF/default.nix +++ b/pkgs/applications/virtualization/OVMF/default.nix @@ -74,7 +74,6 @@ let in assert platformSpecific ? ${cpuName}; -assert systemManagementModeRequired -> stdenv.hostPlatform.isx86; assert msVarsTemplate -> fdSize4MB; assert msVarsTemplate -> platformSpecific.${cpuName} ? msVarsArgs; diff --git a/pkgs/applications/window-managers/dk/default.nix b/pkgs/applications/window-managers/dk/default.nix index 761f9029c9eeb..52084836890e0 100644 --- a/pkgs/applications/window-managers/dk/default.nix +++ b/pkgs/applications/window-managers/dk/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dk"; - version = "1.9"; + version = "2.0"; src = fetchFromBitbucket { owner = "natemaia"; repo = "dk"; rev = "v${finalAttrs.version}"; - hash = "sha256-OodD2z9C4oGTK6ynAXRlEZSzzdzIkVjmq5vLdUcht1U="; + hash = "sha256-AzvpvcH0S8WJNzYXMwvF6CIRDXnh/c6B8g2iWDQI6Qw="; }; buildInputs = [ |