tjh.dev
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
1diff --git a/cmake/globals.cmake b/cmake/globals.cmake
2index e53248b..179e3cb 100644
3--- a/cmake/globals.cmake
4+++ b/cmake/globals.cmake
5@@ -23,11 +23,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL Linux)
6 set(LINUX TRUE CACHE INTERNAL "")
7 endif()
8
9-# read /etc/os-release
10-if(LINUX)
11- include(OsRelease)
12-endif()
13-
14 # version info
15 if ("$ENV{RSTUDIO_VERSION_MAJOR}" STREQUAL "")
16 string(TIMESTAMP CPACK_PACKAGE_VERSION_MAJOR "%Y")
17diff --git a/cmake/modules/OsRelease.cmake b/cmake/modules/OsRelease.cmake
18deleted file mode 100644
19index 81a9e1f..0000000
20--- a/cmake/modules/OsRelease.cmake
21+++ /dev/null
22@@ -1,24 +0,0 @@
23-#
24-# OsRelease.cmake
25-#
26-# Copyright (C) 2022 by Posit Software, PBC
27-#
28-# This program is licensed to you under the terms of version 3 of the
29-# GNU Affero General Public License. This program is distributed WITHOUT
30-# ANY EXPRESS OR IMPLIED WARRANTY, INCLUDING THOSE OF NON-INFRINGEMENT,
31-# MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Please refer to the
32-# AGPL (http://www.gnu.org/licenses/agpl-3.0.txt) for more details.
33-#
34-#
35-
36-# reads and parses /etc/os-release into CMake variables
37-file(STRINGS "/etc/os-release" OS_RELEASE)
38-foreach(LINE ${OS_RELEASE})
39- string(FIND "${LINE}" "=" INDEX)
40- string(SUBSTRING "${LINE}" 0 "${INDEX}" KEY)
41- math(EXPR INDEX "${INDEX} + 1")
42- string(SUBSTRING "${LINE}" "${INDEX}" -1 VALUE)
43- separate_arguments(VALUE UNIX_COMMAND "${VALUE}")
44- set("OS_RELEASE_${KEY}" "${VALUE}" CACHE INTERNAL "/etc/os-release: ${KEY}")
45-endforeach()
46-
47diff --git a/package/linux/CMakeLists.txt b/package/linux/CMakeLists.txt
48index 2c55ebe..7ac9651 100644
49--- a/package/linux/CMakeLists.txt
50+++ b/package/linux/CMakeLists.txt
51@@ -16,7 +16,7 @@
52 # configure cpack install location
53 set(CPACK_SET_DESTDIR "ON")
54 set(CPACK_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
55-message(STATUS "Packaging RStudio for ${OS_RELEASE_PRETTY_NAME}")
56+message(STATUS "Packaging RStudio for Nix")
57
58 # detect architecture (packaging platform specific)
59 find_program(DPKG_EXECUTABLE dpkg)
60@@ -42,17 +42,6 @@ if(EXISTS "/etc/redhat-release")
61 endif()
62 endif()
63
64-# set libssl dependency
65-if(OS_RELEASE_ID STREQUAL "ubuntu")
66- if(OS_RELEASE_VERSION_ID VERSION_GREATER_EQUAL "22.04")
67- set(RSTUDIO_DEBIAN_DEPENDS_SSL "libssl-dev")
68- else()
69- set(RSTUDIO_DEBIAN_DEPENDS_SSL "libssl1.0.0 | libssl1.0.2 | libssl1.1")
70- endif()
71-else()
72- set(RSTUDIO_DEBIAN_DEPENDS_SSL "libssl-dev")
73-endif()
74-
75 # configuration specific
76 if(RSTUDIO_SERVER)
77