diff --git a/pkgs/by-name/sc/scopehal-apps/package.nix b/pkgs/by-name/sc/scopehal-apps/package.nix index 57ab8162b3dd..ac2ec7a529c4 100644 --- a/pkgs/by-name/sc/scopehal-apps/package.nix +++ b/pkgs/by-name/sc/scopehal-apps/package.nix @@ -30,7 +30,7 @@ let pname = "scopehal-apps"; - version = "0.1"; + version = "0.1.1"; in stdenv.mkDerivation { pname = "${pname}"; @@ -40,7 +40,7 @@ stdenv.mkDerivation { owner = "ngscopeclient"; repo = "${pname}"; tag = "v${version}"; - hash = "sha256-AfO6JaWA9ECMI6FkMg/LaAG4QMeZmG9VxHiw0dSJYNM="; + hash = "sha256-7ZXfxfRa+1fbMj2IDF/boNL/qCy4i9IyMnzIgOZunDw="; fetchSubmodules = true; }; @@ -85,7 +85,8 @@ stdenv.mkDerivation { ]; cmakeFlags = [ - "-DNGSCOPECLIENT_VERSION=${version}" + "-DNGSCOPECLIENT_PACKAGE_VERSION=v${version}" + "-DNGSCOPECLIENT_PACKAGE_VERSION_LONG=v${version}-0" ]; env.NIX_CFLAGS_COMPILE = toString [ @@ -94,7 +95,7 @@ stdenv.mkDerivation { ]; patches = [ - ./remove-git-derived-version.patch + ./remove-required-lsb-release.patch ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ./remove-brew-molten-vk-lookup.patch diff --git a/pkgs/by-name/sc/scopehal-apps/remove-git-derived-version.patch b/pkgs/by-name/sc/scopehal-apps/remove-git-derived-version.patch deleted file mode 100644 index 9facccfe0be9..000000000000 --- a/pkgs/by-name/sc/scopehal-apps/remove-git-derived-version.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d362165d..7e3dfd09 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -23,45 +23,6 @@ if(DEFINED ENV{VULKAN_SDK}) - endif() - endif() - --# Git is used for git-describe based version generation if we have it --find_package(Git) -- --#Set up versioning (with a dummy string for now if Git isn't present) --if(Git_FOUND) -- execute_process( -- COMMAND ${GIT_EXECUTABLE} describe --always --tags -- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} -- OUTPUT_VARIABLE NGSCOPECLIENT_VERSION -- OUTPUT_STRIP_TRAILING_WHITESPACE) -- message("Git reports scopehal-apps version ${NGSCOPECLIENT_VERSION}") -- -- -- execute_process( -- COMMAND ${GIT_EXECUTABLE} describe --always --tags --long -- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} -- OUTPUT_VARIABLE NGSCOPECLIENT_VERSION_LONG -- OUTPUT_STRIP_TRAILING_WHITESPACE) -- -- # TODO: if/when we have a point release, make MSI version 10x+9 -- # ex: 0.1.2-rc2 is 0.1.22 -- # ex: 0.1.2 is 0.1.29 -- -- # Ugly string parsing to make windows build happy -- # First path: release candidate tags -- if(NGSCOPECLIENT_VERSION_LONG MATCHES "v([0-9]*).([0-9]*)-rc([0-9])-([0-9]*)") -- set(MSI_VERSION "${CMAKE_MATCH_1}.${CMAKE_MATCH_2}.${CMAKE_MATCH_3}.${CMAKE_MATCH_4}") -- -- # Release tags -- elseif(NGSCOPECLIENT_VERSION_LONG MATCHES "v([0-9]*).([0-9]*)-([0-9]*)") -- set(MSI_VERSION "${CMAKE_MATCH_1}.${CMAKE_MATCH_2}.9.${CMAKE_MATCH_3}") -- endif() -- --else() -- set(NGSCOPECLIENT_VERSION "unknown") -- set(MSI_VERSION "0.1") -- message("Git not detected, scopehal-apps version unknown") --endif() -- - set(PROJECT_VERSION "${NGSCOPECLIENT_VERSION}") - - include(CTest) diff --git a/pkgs/by-name/sc/scopehal-apps/remove-required-lsb-release.patch b/pkgs/by-name/sc/scopehal-apps/remove-required-lsb-release.patch new file mode 100644 index 000000000000..5a53aa4649b7 --- /dev/null +++ b/pkgs/by-name/sc/scopehal-apps/remove-required-lsb-release.patch @@ -0,0 +1,22 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 69d8c7b..a2f3b8c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -337,14 +337,14 @@ set(CPACK_STRIP_FILES TRUE) + + # Figure out what distro version we're on + if(LINUX) +- find_program(LSB_RELEASE_EXEC lsb_release REQUIRED) ++ find_program(LSB_RELEASE_EXEC lsb_release) + execute_process(COMMAND ${LSB_RELEASE_EXEC} -is + OUTPUT_VARIABLE DISTRO_NAME + OUTPUT_STRIP_TRAILING_WHITESPACE +- COMMAND_ERROR_IS_FATAL ANY) ++ ) + execute_process(COMMAND ${LSB_RELEASE_EXEC} -rs + OUTPUT_VARIABLE DISTRO_VER + OUTPUT_STRIP_TRAILING_WHITESPACE +- COMMAND_ERROR_IS_FATAL ANY) ++ ) + + message(STATUS "Linux distribution target for packaging: name ${DISTRO_NAME}, version ${DISTRO_VER}")